optimize large files upload

Dockerfile

@@ -2,7 +2,7 @@ FROM ruby:3.3.1-alpine3.18 as fonts
 
 WORKDIR /fonts
 
-RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt
+RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/v2031/DancingScript-Regular.otf && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt
 
 RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'
 

app/controllers/account_configs_controller.rb

@@ -8,6 +8,7 @@ class AccountConfigsController < ApplicationController
     AccountConfig::ALLOW_TYPED_SIGNATURE,
     AccountConfig::FORCE_MFA,
     AccountConfig::ALLOW_TO_RESUBMIT,
+    AccountConfig::FORM_PREFILL_SIGNATURE_KEY,
     AccountConfig::ESIGNING_PREFERENCE_KEY,
     AccountConfig::FORM_WITH_CONFETTI_KEY,
     AccountConfig::DOWNLOAD_LINKS_AUTH_KEY,

app/controllers/api/attachments_controller.rb

@@ -1,16 +1,37 @@
 # frozen_string_literal: true
 
 module Api
-  class AttachmentsController < ApiBaseController
-    skip_before_action :authenticate_user!
-    skip_authorization_check
+  class AttachmentsController < ActionController::API
+    include ActionController::Cookies
+    include ActiveStorage::SetCurrent
+
+    COOKIE_STORE_LIMIT = 10
 
     def create
       submitter = Submitter.find_by!(slug: params[:submitter_slug])
 
       attachment = Submitters.create_attachment!(submitter, params)
 
+      if params[:remember_signature] == 'true' && submitter.email.present?
+        cookies.encrypted[:signature_uuids] = build_new_cookie_signatures_json(submitter, attachment)
+      end
+
       render json: attachment.as_json(only: %i[uuid], methods: %i[url filename content_type])
     end
+
+    def build_new_cookie_signatures_json(submitter, attachment)
+      values =
+        begin
+          JSON.parse(cookies.encrypted[:signature_uuids].presence || '{}')
+        rescue JSON::ParserError
+          {}
+        end
+
+      values[submitter.email] = attachment.uuid
+
+      values = values.to_a.last(COOKIE_STORE_LIMIT).to_h if values.size > COOKIE_STORE_LIMIT
+
+      values.to_json
+    end
   end
 end

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/submitter_email_clicks_controller.rb

@@ -8,7 +8,8 @@ module Api
     def create
       submitter = Submitter.find_by!(slug: params[:submitter_slug])
 
-      if params[:t] == SubmissionEvents.build_tracking_param(submitter, 'click_email')
+      if params[:t] == SubmissionEvents.build_tracking_param(submitter, 'click_email') ||
+         params[:t] == SubmissionEvents.build_tracking_param_legacy(submitter, 'click_email')
         SubmissionEvents.create_with_tracking_data(submitter, 'click_email', request)
       end
 

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
 
@@ -123,15 +123,32 @@ module Api
       values = values.except(phone_field_uuid)
 
       submitter.values = submitter.values.merge(values) if values.present?
-      submitter.completed_at = attrs[:completed] ? Time.current : submitter.completed_at
       submitter.metadata = attrs[:metadata] if attrs.key?(:metadata)
 
+      maybe_assign_completed_attributes(submitter, attrs)
+
       assign_external_id(submitter, attrs)
       assign_preferences(submitter, attrs)
 
       submitter
     end
 
+    def maybe_assign_completed_attributes(submitter, attrs)
+      submitter.completed_at = attrs[:completed] ? Time.current : submitter.completed_at
+
+      if attrs[:completed]
+        submitter.values = Submitters::SubmitValues.merge_default_values(submitter)
+        submitter.values = Submitters::SubmitValues.merge_formula_values(submitter)
+        submitter.values = Submitters::SubmitValues.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
+      end
+
+      submitter
+    end
+
     def assign_external_id(submitter, attrs)
       submitter.external_id = attrs[:application_key] if attrs.key?(:application_key)
       submitter.external_id = attrs[:external_id] if attrs.key?(:external_id)

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/console_redirect_controller.rb

@@ -9,6 +9,8 @@ class ConsoleRedirectController < ApplicationController
       params[:redir] = Docuseal.multitenant? ? "#{Docuseal::CONSOLE_URL}/plans" : "#{Docuseal::CONSOLE_URL}/on_premise"
     end
 
+    params[:redir] = "#{Docuseal::CONSOLE_URL}/manage" if request.path == '/manage'
+
     return redirect_to(new_user_session_path({ redir: params[:redir] }.compact)) if true_user.blank?
 
     auth = JsonWebToken.encode(uuid: true_user.uuid,

app/controllers/esign_settings_controller.rb

@@ -58,6 +58,8 @@ class EsignSettingsController < ApplicationController
 
     redirect_to settings_esign_path, notice: 'Certificate has been successfully added!'
   rescue OpenSSL::PKCS12::PKCS12Error => e
+    Rollbar.error(e) if defined?(Rollbar)
+
     @cert_record.errors.add(:password, e.message)
 
     render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'), status: :unprocessable_entity

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/controllers/submissions_debug_controller.rb

@@ -16,13 +16,16 @@ class SubmissionsDebugController < ApplicationController
         render 'submit_form/show'
       end
       f.pdf do
-        if params[:audit]
-          Submissions::GenerateAuditTrail.call(@submitter.submission)
-        else
-          Submissions::GenerateResultAttachments.call(@submitter)
-        end
+        result =
+          if params[:audit]
+            Submissions::GenerateAuditTrail.call(@submitter.submission)
+          elsif params[:combined]
+            Submissions::GenerateCombinedAttachment.call(@submitter)
+          else
+            Submissions::GenerateResultAttachments.call(@submitter)
+          end
 
-        send_data ActiveStorage::Attachment.where(name: params[:audit] ? :audit_trail : :documents).last.download,
+        send_data Array.wrap(result).first.download,
                   filename: 'debug.pdf',
                   disposition: 'inline',
                   type: 'application/pdf'

app/controllers/submissions_download_controller.rb

@@ -33,7 +33,17 @@ class SubmissionsDownloadController < ApplicationController
       return head :not_found
     end
 
-    render json: build_urls(last_submitter)
+    if params[:combined]
+      url = build_combined_url(submitter)
+
+      if url
+        render json: [url]
+      else
+        head :not_found
+      end
+    else
+      render json: build_urls(last_submitter)
+    end
   end
 
   private
@@ -47,4 +57,14 @@ class SubmissionsDownloadController < ApplicationController
       ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
     end
   end
+
+  def build_combined_url(submitter)
+    return if submitter.submission.submitters.exists?(completed_at: nil)
+    return if submitter.submission.submitters.order(:completed_at).last != submitter
+
+    attachment = submitter.submission.combined_document_attachment
+    attachment ||= Submissions::GenerateCombinedAttachment.call(submitter)
+
+    ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
+  end
 end

app/controllers/submit_form_controller.rb

@@ -7,12 +7,14 @@ class SubmitFormController < ApplicationController
   skip_before_action :authenticate_user!
   skip_authorization_check
 
+  CONFIG_KEYS = [].freeze
   PRELOAD_ALL_PAGES_AMOUNT = 200
 
   def show
     @submitter = Submitter.find_by!(slug: params[:slug])
 
     return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
+    return render :archived if @submitter.submission.template.archived_at? || @submitter.submission.archived_at?
 
     ActiveRecord::Associations::Preloader.new(
       records: [@submitter],
@@ -31,7 +33,17 @@ class SubmitFormController < ApplicationController
 
     Submitters::MaybeUpdateDefaultValues.call(@submitter, current_user)
 
-    render(@submitter.submission.template.archived_at? || @submitter.submission.archived_at? ? :archived : :show)
+    @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
+                                                  .preload(:blob).index_by(&:uuid)
+
+    @form_configs = Submitters::FormConfigs.call(@submitter, CONFIG_KEYS)
+
+    return unless @form_configs[:prefill_signature]
+
+    @signature_attachment =
+      Submitters::MaybeAssignDefaultBrowserSignature.call(@submitter, params, cookies, @attachments_index.values)
+
+    @attachments_index[@signature_attachment.uuid] = @signature_attachment if @signature_attachment
   end
 
   def update

app/controllers/submit_form_draw_signature_controller.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class SubmitFormDrawSignatureController < ApplicationController
+  layout false
+
+  around_action :with_browser_locale, only: %i[show]
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def show
+    @submitter = Submitter.find_by!(slug: params[:slug])
+
+    return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
+
+    if @submitter.submission.template.archived_at? || @submitter.submission.archived_at?
+      return redirect_to submit_form_path(@submitter.slug)
+    end
+
+    render :show
+  end
+end

app/controllers/submit_form_values_controller.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class SubmitFormValuesController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def index
+    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+
+    return render json: {} if submitter.completed_at?
+    return render json: {} if submitter.submission.template.archived_at? || submitter.submission.archived_at?
+
+    value = submitter.values[params['field_uuid']]
+    attachment = submitter.attachments.where(created_at: params[:after]..).find_by(uuid: value) if value.present?
+
+    render json: {
+      value:,
+      attachment: attachment&.as_json(only: %i[uuid], methods: %i[url filename content_type])
+    }, head: :ok
+  end
+end

app/controllers/submitters_autocomplete_controller.rb

@@ -25,7 +25,7 @@ class SubmittersAutocompleteController < ApplicationController
 
       term = "#{params[:q].downcase}%"
 
-      submitters.where(column.matches(term, false, true))
+      submitters.where(column.matches(term))
     else
       Submitters.search(submitters, params[:q])
     end

app/controllers/template_documents_controller.rb

@@ -4,7 +4,9 @@ class TemplateDocumentsController < ApplicationController
   load_and_authorize_resource :template
 
   def create
-    return head :unprocessable_entity if params[:blobs].blank? && params[:files].blank?
+    if params[:blobs].blank? && params[:files].blank?
+      return render json: { error: 'File is missing' }, status: :unprocessable_entity
+    end
 
     old_fields_hash = @template.fields.hash
 

app/controllers/templates_preferences_controller.rb

@@ -9,6 +9,7 @@ class TemplatesPreferencesController < ApplicationController
     authorize!(:update, @template)
 
     @template.preferences = @template.preferences.merge(template_params[:preferences])
+    @template.preferences = @template.preferences.reject { |_, v| v.is_a?(String) && v.blank? }
     @template.save!
 
     head :ok
@@ -19,7 +20,16 @@ class TemplatesPreferencesController < ApplicationController
   def template_params
     params.require(:template).permit(
       preferences: %i[bcc_completed request_email_subject request_email_body
-                      documents_copy_email_subject documents_copy_email_body]
-    )
+                      documents_copy_email_subject documents_copy_email_body
+                      documents_copy_email_enabled]
+    ).tap do |attrs|
+      attrs[:preferences] = attrs[:preferences].transform_values do |value|
+        if %w[true false].include?(value)
+          value == 'true'
+        else
+          value
+        end
+      end
+    end
   end
 end

app/controllers/templates_uploads_controller.rb

@@ -26,6 +26,8 @@ class TemplatesUploadsController < ApplicationController
   rescue StandardError => e
     Rollbar.error(e) if defined?(Rollbar)
 
+    raise if Rails.env.local?
+
     redirect_to root_path, alert: 'Unable to upload file'
   end
 

app/controllers/user_initials_controller.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class UserInitialsController < ApplicationController
+  before_action :load_user_config
+  authorize_resource :user_config
+
+  def edit; end
+
+  def update
+    file = params[:file]
+
+    return redirect_to settings_profile_index_path, notice: 'Unable to save initials' if file.blank?
+
+    blob = ActiveStorage::Blob.create_and_upload!(io: file.open,
+                                                  filename: file.original_filename,
+                                                  content_type: file.content_type)
+
+    attachment = ActiveStorage::Attachment.create!(
+      blob:,
+      name: 'initials',
+      record: current_user
+    )
+
+    if @user_config.update(value: attachment.uuid)
+      redirect_to settings_profile_index_path, notice: 'Initials has been saved'
+    else
+      redirect_to settings_profile_index_path, notice: 'Unable to save initials'
+    end
+  end
+
+  def destroy
+    @user_config.destroy
+
+    redirect_to settings_profile_index_path, notice: 'Initials has been removed'
+  end
+
+  private
+
+  def load_user_config
+    @user_config =
+      UserConfig.find_or_initialize_by(user: current_user, key: UserConfig::INITIALS_KEY)
+  end
+end

app/controllers/users_controller.rb

@@ -27,6 +27,7 @@ class UsersController < ApplicationController
     if existing_user
       existing_user.archived_at = nil
       existing_user.assign_attributes(user_params)
+      existing_user.account = current_account
 
       @user = existing_user
     end
@@ -46,6 +47,14 @@ class UsersController < ApplicationController
     attrs = user_params.compact_blank.merge(user_params.slice(:archived_at))
     attrs.delete(:role) if !role_valid?(attrs[:role]) || current_user == @user
 
+    if params.dig(:user, :account_id).present?
+      account = Account.accessible_by(current_ability).find(params[:user][:account_id])
+
+      authorize!(:manage, account)
+
+      @user.account = account
+    end
+
     if @user.update(attrs)
       redirect_back fallback_location: settings_users_path, notice: 'User has been updated'
     else

app/javascript/application.js

@@ -41,26 +41,6 @@ document.addEventListener('keyup', (e) => {
   }
 })
 
-window.customElements.define('toggle-visible', ToggleVisible)
-window.customElements.define('disable-hidden', DisableHidden)
-window.customElements.define('turbo-modal', TurboModal)
-window.customElements.define('file-dropzone', FileDropzone)
-window.customElements.define('menu-active', MenuActive)
-window.customElements.define('clipboard-copy', ClipboardCopy)
-window.customElements.define('dynamic-list', DynamicList)
-window.customElements.define('download-button', DownloadButton)
-window.customElements.define('set-origin-url', SetOriginUrl)
-window.customElements.define('set-timezone', SetTimezone)
-window.customElements.define('autoresize-textarea', AutoresizeTextarea)
-window.customElements.define('submitters-autocomplete', SubmittersAutocomplete)
-window.customElements.define('folder-autocomplete', FolderAutocomplete)
-window.customElements.define('signature-form', SignatureForm)
-window.customElements.define('submit-form', SubmitForm)
-window.customElements.define('prompt-password', PromptPassword)
-window.customElements.define('emails-textarea', EmailsTextarea)
-window.customElements.define('toggle-cookies', ToggleCookies)
-window.customElements.define('toggle-on-submit', ToggleOnSubmit)
-
 document.addEventListener('turbo:before-fetch-request', encodeMethodIntoRequestBody)
 document.addEventListener('turbo:submit-end', async (event) => {
   const resp = event.detail?.formSubmission?.result?.fetchResponse?.response
@@ -84,7 +64,29 @@ document.addEventListener('turbo:submit-end', async (event) => {
   URL.revokeObjectURL(url)
 })
 
-window.customElements.define('template-builder', class extends HTMLElement {
+const safeRegisterElement = (name, element, options = {}) => !window.customElements.get(name) && window.customElements.define(name, element, options)
+
+safeRegisterElement('toggle-visible', ToggleVisible)
+safeRegisterElement('disable-hidden', DisableHidden)
+safeRegisterElement('turbo-modal', TurboModal)
+safeRegisterElement('file-dropzone', FileDropzone)
+safeRegisterElement('menu-active', MenuActive)
+safeRegisterElement('clipboard-copy', ClipboardCopy)
+safeRegisterElement('dynamic-list', DynamicList)
+safeRegisterElement('download-button', DownloadButton)
+safeRegisterElement('set-origin-url', SetOriginUrl)
+safeRegisterElement('set-timezone', SetTimezone)
+safeRegisterElement('autoresize-textarea', AutoresizeTextarea)
+safeRegisterElement('submitters-autocomplete', SubmittersAutocomplete)
+safeRegisterElement('folder-autocomplete', FolderAutocomplete)
+safeRegisterElement('signature-form', SignatureForm)
+safeRegisterElement('submit-form', SubmitForm)
+safeRegisterElement('prompt-password', PromptPassword)
+safeRegisterElement('emails-textarea', EmailsTextarea)
+safeRegisterElement('toggle-cookies', ToggleCookies)
+safeRegisterElement('toggle-on-submit', ToggleOnSubmit)
+
+safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {
     this.appElem = document.createElement('div')
 
@@ -116,7 +118,7 @@ window.customElements.define('template-builder', class extends HTMLElement {
   }
 })
 
-window.customElements.define('import-list', class extends HTMLElement {
+safeRegisterElement('import-list', class extends HTMLElement {
   connectedCallback () {
     this.appElem = document.createElement('div')
 

app/javascript/draw.js

@@ -0,0 +1,114 @@
+import SignaturePad from 'signature_pad'
+import { cropCanvasAndExportToPNG } from './submission_form/crop_canvas'
+
+window.customElements.define('draw-signature', class extends HTMLElement {
+  connectedCallback () {
+    const scale = 3
+
+    this.canvas.width = this.canvas.parentNode.clientWidth * scale
+    this.canvas.height = this.canvas.parentNode.clientHeight * scale
+
+    this.canvas.getContext('2d').scale(scale, scale)
+
+    this.pad = new SignaturePad(this.canvas)
+
+    this.pad.addEventListener('endStroke', () => {
+      this.updateSubmitButtonVisibility()
+    })
+
+    this.clearButton.addEventListener('click', (e) => {
+      e.preventDefault()
+
+      this.clearSignaturePad()
+    })
+
+    this.form.addEventListener('submit', (e) => {
+      e.preventDefault()
+
+      this.submitButton.disabled = true
+
+      this.submitImage().then((data) => {
+        this.valueInput.value = data.uuid
+
+        return fetch(this.form.action, {
+          method: 'PUT',
+          body: new FormData(this.form)
+        }).then((response) => {
+          this.form.classList.add('hidden')
+          this.success.classList.remove('hidden')
+
+          return response
+        })
+      }).finally(() => {
+        this.submitButton.disabled = false
+      })
+    })
+  }
+
+  clearSignaturePad () {
+    this.pad.clear()
+    this.updateSubmitButtonVisibility()
+  }
+
+  updateSubmitButtonVisibility () {
+    if (this.pad.isEmpty()) {
+      this.submitButton.style.display = 'none'
+      this.placeholderButton.style.display = 'block'
+    } else {
+      this.submitButton.style.display = 'block'
+      this.placeholderButton.style.display = 'none'
+    }
+  }
+
+  async submitImage () {
+    return new Promise((resolve, reject) => {
+      cropCanvasAndExportToPNG(this.canvas, { errorOnTooSmall: true }).then(async (blob) => {
+        const file = new File([blob], 'signature.png', { type: 'image/png' })
+
+        const formData = new FormData()
+
+        formData.append('file', file)
+        formData.append('submitter_slug', this.dataset.slug)
+        formData.append('name', 'attachments')
+        formData.append('remember_signature', 'true')
+
+        return fetch('/api/attachments', {
+          method: 'POST',
+          body: formData
+        }).then((resp) => resp.json()).then((attachment) => {
+          return resolve(attachment)
+        })
+      }).catch((error) => {
+        return reject(error)
+      })
+    })
+  }
+
+  get submitButton () {
+    return this.querySelector('button[type="submit"]')
+  }
+
+  get clearButton () {
+    return this.querySelector('button[aria-label="Clear"]')
+  }
+
+  get placeholderButton () {
+    return this.querySelector('button[disabled]')
+  }
+
+  get canvas () {
+    return this.querySelector('canvas')
+  }
+
+  get valueInput () {
+    return this.querySelector('input[name^="values"]')
+  }
+
+  get form () {
+    return this.querySelector('form')
+  }
+
+  get success () {
+    return this.querySelector('#success')
+  }
+})

app/javascript/elements/download_button.js

@@ -17,13 +17,18 @@ export default targetable(class extends HTMLElement {
 
     this.toggleState()
 
-    fetch(this.dataset.src).then((response) => response.json()).then((urls) => {
-      const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
+    fetch(this.dataset.src).then(async (response) => {
+      if (response.ok) {
+        const urls = await response.json()
+        const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
 
-      if (isSafariIos && urls.length > 1) {
-        this.downloadSafariIos(urls)
+        if (isSafariIos && urls.length > 1) {
+          this.downloadSafariIos(urls)
+        } else {
+          this.downloadUrls(urls)
+        }
       } else {
-        this.downloadUrls(urls)
+        alert('Failed to download files')
       }
     })
   }

app/javascript/elements/submitter_autocomplete.js

@@ -45,11 +45,7 @@ export default class extends HTMLElement {
       this.currentFetch.then(async (resp) => {
         const items = await resp.json()
 
-        if (q.length < 3) {
-          resolve(items.filter((e) => e[this.dataset.field].startsWith(q)))
-        } else {
-          resolve(items)
-        }
+        resolve(items)
       }).catch(() => {
         resolve([])
       }).finally(() => {

app/javascript/elements/toggle_submit.js

@@ -0,0 +1,21 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.button.disabled = false
+
+    this.form.addEventListener('submit', () => {
+      this.button.disabled = true
+    })
+  }
+
+  disconnectedCallback () {
+    this.button.disabled = false
+  }
+
+  get button () {
+    return this.querySelector('[type="submit"]')
+  }
+
+  get form () {
+    return this.querySelector('form') || this.closest('form')
+  }
+}

app/javascript/form.js

@@ -2,15 +2,20 @@ import { createApp, reactive } from 'vue'
 
 import Form from './submission_form/form'
 import DownloadButton from './elements/download_button'
+import ToggleSubmit from './elements/toggle_submit'
 
-window.customElements.define('download-button', DownloadButton)
-window.customElements.define('submission-form', class extends HTMLElement {
+const safeRegisterElement = (name, element, options = {}) => !window.customElements.get(name) && window.customElements.define(name, element, options)
+
+safeRegisterElement('download-button', DownloadButton)
+safeRegisterElement('toggle-submit', ToggleSubmit)
+safeRegisterElement('submission-form', class extends HTMLElement {
   connectedCallback () {
     this.appElem = document.createElement('div')
 
     this.app = createApp(Form, {
       submitter: JSON.parse(this.dataset.submitter),
       canSendEmail: this.dataset.canSendEmail === 'true',
+      previousSignatureValue: this.dataset.previousSignatureValue,
       goToLast: this.dataset.goToLast === 'true',
       isDemo: this.dataset.isDemo === 'true',
       attribution: this.dataset.attribution !== 'false',
@@ -18,8 +23,10 @@ window.customElements.define('submission-form', class extends HTMLElement {
       withDisclosure: this.dataset.withDisclosure === 'true',
       withTypedSignature: this.dataset.withTypedSignature !== 'false',
       authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
+      rememberSignature: this.dataset.rememberSignature === 'true',
       values: reactive(JSON.parse(this.dataset.values)),
       completedButton: JSON.parse(this.dataset.completedButton || '{}'),
+      withQrButton: true,
       completedMessage: JSON.parse(this.dataset.completedMessage || '{}'),
       completedRedirectUrl: this.dataset.completedRedirectUrl,
       attachments: reactive(JSON.parse(this.dataset.attachments)),

app/javascript/rollbar.js

@@ -0,0 +1,34 @@
+import Rollbar from 'rollbar/dist/rollbar.umd'
+
+const token = document.querySelector('meta[name="rollbar-token"]')?.getAttribute('content')
+
+if (token) {
+  window.Rollbar ||= new Rollbar({
+    accessToken: token,
+    captureUncaught: true,
+    captureUnhandledRejections: true,
+    captureIp: false,
+    autoInstrument: false,
+    ignoredMessages: [
+      /Failed to fetch/i,
+      /NetworkError/i,
+      /Load failed/i,
+      /Clipboard write is not allowed/i
+    ],
+    transform (payload) {
+      payload.body.telemetry = []
+
+      const string = JSON.stringify(payload)
+
+      return JSON.parse(string.replace(/(\/[des]\/)\w{6}/g, (_, m) => m))
+    },
+    payload: {
+      client: {
+        javascript: {
+          source_map_enabled: true
+        }
+      },
+      environment: 'production'
+    }
+  })
+}

app/javascript/submission_form/completed.vue

@@ -197,13 +197,18 @@ export default {
     download () {
       this.isDownloading = true
 
-      fetch(this.baseUrl + `/submitters/${this.submitterSlug}/download`).then((response) => response.json()).then((urls) => {
-        const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
+      fetch(this.baseUrl + `/submitters/${this.submitterSlug}/download`).then(async (response) => {
+        if (response.ok) {
+          const urls = await response.json()
+          const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
 
-        if (isSafariIos && urls.length > 1) {
-          this.downloadSafariIos(urls)
+          if (isSafariIos && urls.length > 1) {
+            this.downloadSafariIos(urls)
+          } else {
+            this.downloadUrls(urls)
+          }
         } else {
-          this.downloadUrls(urls)
+          alert('Failed to download files')
         }
       })
     },

app/javascript/submission_form/date_step.vue

@@ -14,7 +14,9 @@
         />
         <template v-else>
           {{ field.name && showFieldNames ? field.name : t('date') }}
-          <template v-if="!field.required">({{ t('optional') }})</template>
+          <template v-if="!field.required">
+            ({{ t('optional') }})
+          </template>
         </template>
       </label>
       <button

app/javascript/submission_form/form.vue

@@ -321,12 +321,14 @@
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
             :field="currentField"
-            :previous-value="previousSignatureValueFor(currentField)"
+            :previous-value="previousSignatureValueFor(currentField) || previousSignatureValue"
             :with-typed-signature="withTypedSignature"
+            :remember-signature="rememberSignature"
             :attachments-index="attachmentsIndex"
             :button-text="buttonText"
             :with-disclosure="withDisclosure"
-            :submitter-slug="submitterSlug"
+            :with-qr-button="withQrButton"
+            :submitter="submitter"
             :show-field-names="showFieldNames"
             @attached="attachments.push($event)"
             @start="scrollIntoField(currentField)"
@@ -384,7 +386,7 @@
         </div>
         <div
           v-if="currentField.type !== 'payment' || submittedValues[currentField.uuid]"
-          :class="withDisclosure && currentField.type === 'signature' ? 'mt-2' : 'mt-6 md:mt-8'"
+          :class="currentField.type === 'signature' ? 'mt-2' : 'mt-6 md:mt-8'"
         >
           <button
             id="submit_form_button"
@@ -548,6 +550,11 @@ export default {
       required: false,
       default: null
     },
+    rememberSignature: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     minimize: {
       type: Boolean,
       required: false,
@@ -578,6 +585,11 @@ export default {
       required: false,
       default: true
     },
+    withQrButton: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withTypedSignature: {
       type: Boolean,
       required: false,
@@ -603,6 +615,11 @@ export default {
       required: false,
       default: ''
     },
+    previousSignatureValue: {
+      type: String,
+      required: false,
+      default: ''
+    },
     allowToSkip: {
       type: Boolean,
       required: false,
@@ -779,7 +796,7 @@ export default {
       this.isFormVisible = value
     },
     currentStepFields (value) {
-      if (isEmpty(value)) {
+      if (isEmpty(value) && this.currentStep > 0) {
         this.currentStep -= 1
       }
     }
@@ -972,14 +989,16 @@ export default {
       this.$nextTick(() => {
         this.recalculateButtonDisabledKey = Math.random()
 
-        if (scrollToArea) {
-          this.scrollIntoField(step[0])
+        if (!this.isCompleted) {
+          if (scrollToArea) {
+            this.scrollIntoField(step[0])
 
-          this.$refs.form.querySelector('input[type="date"], input[type="number"], input[type="text"], select')?.focus()
-        }
+            this.$refs.form.querySelector('input[type="date"], input[type="number"], input[type="text"], select')?.focus()
+          }
 
-        if (clickUpload && !this.values[this.currentField.uuid] && ['file', 'image'].includes(this.currentField.type)) {
-          this.$refs.form.querySelector('input[type="file"]')?.click()
+          if (clickUpload && !this.values[this.currentField.uuid] && ['file', 'image'].includes(this.currentField.type)) {
+            this.$refs.form.querySelector('input[type="file"]')?.click()
+          }
         }
       })
     },

app/javascript/submission_form/i18n.js

@@ -5,6 +5,8 @@ const en = {
   esignature_disclosure: 'eSignature Disclosure',
   signature: 'Signature',
   initials: 'Initials',
+  drawn_signature_on_a_touchscreen_device: 'Drawn signature on a touchscreen device',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scan the QR code with the camera app to open the form on mobile and draw your signature',
   date: 'Date',
   number: 'Number',
   image: 'Image',
@@ -68,6 +70,8 @@ const en = {
 }
 
 const es = {
+  drawn_signature_on_a_touchscreen_device: 'Firma dibujada en un dispositivo con pantalla táctil',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Escanea el código QR con la aplicación de la cámara para abrir el formulario en el móvil y dibujar tu firma',
   by_clicking_you_agree_to_the: 'Al hacer clic en "{button}", usted acepta el',
   electronic_signature_disclosure: 'Divulgación de Firma Electrónica',
   esignature_disclosure: 'Divulgación de eFirma',
@@ -136,6 +140,8 @@ const es = {
 }
 
 const it = {
+  drawn_signature_on_a_touchscreen_device: 'Firma disegnata su un dispositivo con schermo tattile',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scansiona il codice QR con l\'app della fotocamera per aprire il modulo sul cellulare e disegnare la tua firma',
   by_clicking_you_agree_to_the: 'Cliccando su "{button}", accetti il',
   electronic_signature_disclosure: 'Divulgazione della Firma Elettronica',
   esignature_disclosure: 'Divulgazione della eFirma',
@@ -204,6 +210,8 @@ const it = {
 }
 
 const de = {
+  drawn_signature_on_a_touchscreen_device: 'Gezeichnete Unterschrift auf einem Touchscreen-Gerät',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scannen Sie den QR-Code mit der Kamera-App, um das Formular auf dem Handy zu öffnen und Ihre Unterschrift zu zeichnen',
   by_clicking_you_agree_to_the: 'Durch Klicken auf "{button}" stimmen Sie zu, dass Sie die',
   electronic_signature_disclosure: 'Elektronische Unterschriftenoffenlegung',
   esignature_disclosure: 'eSignatur Offenlegung',
@@ -272,6 +280,8 @@ const de = {
 }
 
 const fr = {
+  drawn_signature_on_a_touchscreen_device: 'Signature dessinée sur un appareil à écran tactile',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scannez le code QR avec l\'application de l\'appareil photo pour ouvrir le formulaire sur mobile et dessiner votre signature',
   by_clicking_you_agree_to_the: 'En cliquant sur "{button}", vous acceptez la',
   electronic_signature_disclosure: 'Divulgation de Signature Électronique',
   esignature_disclosure: 'Divulgation de la eSignature',
@@ -340,6 +350,8 @@ const fr = {
 }
 
 const pl = {
+  drawn_signature_on_a_touchscreen_device: 'Podpis odręczny na urządzeniu z ekranem dotykowym',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Zeskanuj kod QR za pomocą aplikacji aparatu, aby otworzyć formularz na telefonie i narysować swój podpis',
   by_clicking_you_agree_to_the: 'Klikając na "{button}", zgadzasz się na',
   electronic_signature_disclosure: 'Ujawnienie Elektronicznej Sygnatury',
   esignature_disclosure: 'Ujawnienie ePodpisu',
@@ -408,6 +420,8 @@ const pl = {
 }
 
 const uk = {
+  drawn_signature_on_a_touchscreen_device: 'Підпис на сенсорному пристрої',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Скануйте QR-код за допомогою програми камери, щоб відкрити форму на мобільному пристрої та намалювати свій підпис',
   by_clicking_you_agree_to_the: 'Натиснувши на "{button}", ви погоджуєтеся з',
   electronic_signature_disclosure: 'Розголошення Електронного Підпису',
   esignature_disclosure: 'Розголошення еПідпису',
@@ -476,6 +490,8 @@ const uk = {
 }
 
 const cs = {
+  drawn_signature_on_a_touchscreen_device: 'Namalovaný podpis na dotykovém zařízení',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Naskenujte QR kód pomocí aplikace fotoaparátu, abyste otevřeli formulář na mobilním zařízení a nakreslili svůj podpis',
   by_clicking_you_agree_to_the: 'Kliknutím na "{button}" souhlasíte s',
   electronic_signature_disclosure: 'Zveřejněním Elektronického Podpisu',
   esignature_disclosure: 'Zveřejnění ePodpisu',
@@ -544,6 +560,8 @@ const cs = {
 }
 
 const pt = {
+  drawn_signature_on_a_touchscreen_device: 'Assinatura desenhada em um dispositivo com tela sensível ao toque',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Escaneie o código QR com o aplicativo da câmera para abrir o formulário no celular e desenhar sua assinatura',
   by_clicking_you_agree_to_the: 'Ao clicar em "{button}", você concorda com o',
   electronic_signature_disclosure: 'Divulgação de Assinatura Eletrônica',
   esignature_disclosure: 'Divulgação da eAssinatura',
@@ -612,6 +630,8 @@ const pt = {
 }
 
 const he = {
+  drawn_signature_on_a_touchscreen_device: 'חתימה שנוצרה במכשיר עם מסך מגע',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'סרוק את קוד ה-QR באמצעות אפליקציית המצלמה כדי לפתוח את הטופס במובייל ולצייר את החתימה שלך',
   by_clicking_you_agree_to_the: 'על ידי לחיצה על "{button}", אתה מסכים ל',
   electronic_signature_disclosure: 'חשיפת חתימה אלקטרונית',
   esignature_disclosure: 'חשיפת ה-eחתימה',
@@ -681,6 +701,8 @@ const he = {
 }
 
 const nl = {
+  drawn_signature_on_a_touchscreen_device: 'Getekende handtekening op een apparaat met een touchscreen',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scan de QR-code met de camera-app om het formulier op mobiel te openen en uw handtekening te tekenen',
   by_clicking_you_agree_to_the: 'Door op "{button}" te klikken, gaat u akkoord met de',
   electronic_signature_disclosure: 'Openbaarmaking van Elektronische Handtekening',
   esignature_disclosure: 'Openbaarmaking van eHandtekening',
@@ -750,6 +772,8 @@ const nl = {
 }
 
 const ar = {
+  drawn_signature_on_a_touchscreen_device: 'توقيع مرسوم على جهاز بشاشة تعمل باللمس',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'امسح رمز الاستجابة السريعة باستخدام تطبيق الكاميرا لفتح النموذج على الهاتف المحمول ورسم توقيعك',
   by_clicking_you_agree_to_the: 'بالنقر فوق "{button}"، أنت توافق على',
   electronic_signature_disclosure: 'كشف التوقيع الإلكتروني',
   esignature_disclosure: 'كشف التوقيع الإلكتروني',
@@ -819,6 +843,8 @@ const ar = {
 }
 
 const ko = {
+  drawn_signature_on_a_touchscreen_device: '터치스크린 장치에서 그린 서명',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: '카메라 앱으로 QR 코드를 스캔하여 모바일에서 양식을 열고 서명을 그리세요',
   by_clicking_you_agree_to_the: '"{button}"를 클릭함으로써, 다음에 동의하게 됩니다',
   electronic_signature_disclosure: '전자 서명 공개',
   esignature_disclosure: '전자 서명 공개',

app/javascript/submission_form/number_step.vue

@@ -10,7 +10,9 @@
      :string="field.title"
    />
     <template v-else>{{ field.name }}</template>
-    <template v-if="!field.required">({{ t('optional') }})</template>
+    <template v-if="!field.required">
+      ({{ t('optional') }})
+    </template>
   </label>
   <div
     v-else

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/phone_step.vue

@@ -11,7 +11,9 @@
       />
       <template v-else>
         {{ showFieldNames && field.name ? field.name : t('verified_phone_number') }}
-        <template v-if="!field.required">({{ t('optional') }})</template>
+        <template v-if="!field.required">
+          ({{ t('optional') }})
+        </template>
       </template>
     </label>
     <div

app/javascript/submission_form/signature_step.vue

@@ -28,7 +28,7 @@
             id="type_text_button"
             href="#"
             class="btn btn-outline btn-sm font-medium"
-            @click.prevent="toggleTextInput"
+            @click.prevent="[toggleTextInput(), hideQr()]"
           >
             <IconSignature :width="16" />
             <span class="hidden sm:inline">
@@ -45,7 +45,7 @@
             id="type_text_button"
             href="#"
             class="btn btn-outline btn-sm font-medium inline-flex flex-nowrap"
-            @click.prevent="toggleTextInput"
+            @click.prevent="[toggleTextInput(), hideQr()]"
           >
             <IconTextSize :width="16" />
             <span class="hidden sm:inline">
@@ -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"
+        <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')"
@@ -121,14 +129,61 @@
     <img
       v-if="modelValue || computedPreviousValue"
       :src="attachmentsIndex[modelValue || computedPreviousValue].url"
-      class="mx-auto bg-white border border-base-300 rounded max-h-72"
+      class="mx-auto bg-white border border-base-300 rounded max-h-44"
     >
-    <canvas
-      v-show="!modelValue && !computedPreviousValue"
-      ref="canvas"
-      style="padding: 1px; 0"
-      class="bg-white border border-base-300 rounded-2xl w-full"
-    />
+    <div class="relative">
+      <div
+        v-if="!modelValue && !computedPreviousValue && !isShowQr && !isTextSignature && isSignatureStarted"
+        class="absolute top-0.5 right-0.5"
+      >
+        <a
+          href="#"
+          class="btn btn-ghost font-medium btn-xs md:btn-sm"
+          @click.prevent="[clear(), hideQr()]"
+        >
+          <IconReload :width="16" />
+          {{ t('clear') }}
+        </a>
+      </div>
+      <canvas
+        v-show="!modelValue && !computedPreviousValue"
+        ref="canvas"
+        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"
+      >
+        <div
+          class="absolute top-1.5 right-1.5 tooltip"
+        >
+          <a
+            href="#"
+            class="btn btn-sm btn-circle btn-normal btn-outline"
+            @click.prevent="hideQr"
+          >
+            <IconX />
+          </a>
+        </div>
+        <div class="flex items-center justify-center w-full h-full p-4">
+          <div
+            v-if="withQrButton"
+            ref="qr"
+            class="bg-white p-4 rounded-xl h-full"
+          >
+            <canvas
+              ref="qrCanvas"
+              class="h-full"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
     <input
       v-if="isTextSignature"
       id="signature_text_input"
@@ -140,7 +195,14 @@
       @input="updateWrittenSignature"
     >
     <div
-      v-if="withDisclosure"
+      v-if="isShowQr"
+      dir="auto"
+      class="text-base-content/60 text-xs text-center w-full mt-1"
+    >
+      {{ t('scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature') }}
+    </div>
+    <div
+      v-else-if="withDisclosure"
       dir="auto"
       class="text-base-content/60 text-xs text-center w-full mt-1"
     >
@@ -156,11 +218,15 @@
         </span>
       </a>
     </div>
+    <div
+      v-else
+      class="mt-5 md:mt-7"
+    />
   </div>
 </template>
 
 <script>
-import { IconReload, IconCamera, IconSignature, IconTextSize, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
+import { IconReload, IconCamera, IconSignature, IconTextSize, IconArrowsDiagonalMinimize2, IconQrcode, IconX } from '@tabler/icons-vue'
 import { cropCanvasAndExportToPNG } from './crop_canvas'
 import SignaturePad from 'signature_pad'
 import AppearsOn from './appears_on'
@@ -176,7 +242,9 @@ export default {
     AppearsOn,
     IconReload,
     IconCamera,
+    IconQrcode,
     MarkdownContent,
+    IconX,
     IconTextSize,
     IconSignature,
     IconArrowsDiagonalMinimize2
@@ -187,8 +255,8 @@ export default {
       type: Object,
       required: true
     },
-    submitterSlug: {
-      type: String,
+    submitter: {
+      type: Object,
       required: true
     },
     showFieldNames: {
@@ -201,6 +269,11 @@ export default {
       required: false,
       default: false
     },
+    withQrButton: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     buttonText: {
       type: String,
       required: false,
@@ -211,6 +284,11 @@ export default {
       required: false,
       default: true
     },
+    rememberSignature: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     attachmentsIndex: {
       type: Object,
       required: false,
@@ -231,12 +309,16 @@ export default {
   data () {
     return {
       isSignatureStarted: !!this.previousValue,
+      isShowQr: false,
       isUsePreviousValue: true,
       isTextSignature: this.field.preferences?.format === 'typed',
       uploadImageInputKey: Math.random().toString()
     }
   },
   computed: {
+    submitterSlug () {
+      return this.submitter.slug
+    },
     computedPreviousValue () {
       if (this.isUsePreviousValue) {
         return this.previousValue
@@ -253,12 +335,24 @@ export default {
 
         this.$refs.canvas.getContext('2d').scale(scale, scale)
       }
+
+      if (this.withQrButton) {
+        import('qr-creator').then(({ default: Qr }) => {
+          Qr.render({
+            text: `${document.location.origin}/p/${this.submitterSlug}?f=${this.field.uuid.split('-')[0]}`,
+            radius: 0.0,
+            ecLevel: 'H',
+            background: null,
+            size: 132
+          }, this.$refs.qrCanvas)
+        })
+      }
     })
 
     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')
@@ -282,6 +376,7 @@ export default {
   },
   beforeUnmount () {
     this.intersectionObserver?.disconnect()
+    this.stopCheckSignature()
   },
   methods: {
     remove () {
@@ -303,6 +398,41 @@ export default {
         })
       }
     },
+    showQr () {
+      this.isShowQr = true
+
+      this.startCheckSignature()
+    },
+    hideQr () {
+      this.isShowQr = false
+
+      this.stopCheckSignature()
+    },
+    startCheckSignature () {
+      const after = JSON.stringify(new Date())
+
+      this.checkSignatureInterval = setInterval(() => {
+        this.checkSignature({ after })
+      }, 2000)
+    },
+    stopCheckSignature () {
+      if (this.checkSignatureInterval) {
+        clearInterval(this.checkSignatureInterval)
+      }
+    },
+    checkSignature (params = {}) {
+      return fetch(this.baseUrl + '/s/' + this.submitterSlug + '/values?field_uuid=' + this.field.uuid + '&after=' + params.after, {
+        method: 'GET'
+      }).then(async (resp) => {
+        const { attachment } = await resp.json()
+
+        if (attachment?.uuid) {
+          this.$emit('attached', attachment)
+          this.$emit('update:model-value', attachment.uuid)
+          this.hideQr()
+        }
+      })
+    },
     clear () {
       this.pad.clear()
 
@@ -310,6 +440,7 @@ export default {
 
       if (this.$refs.textInput) {
         this.$refs.textInput.value = ''
+        this.$refs.textInput.focus()
       }
     },
     updateWrittenSignature (e) {
@@ -398,6 +529,27 @@ export default {
         this.uploadImageInputKey = Math.random().toString()
       }
     },
+    maybeSetSignedUuid (signedUuid) {
+      try {
+        if (window.localStorage && signedUuid && this.rememberSignature) {
+          const values = window.localStorage.getItem('signed_signature_uuids')
+
+          let data
+
+          if (values) {
+            data = JSON.parse(values)
+          } else {
+            data = {}
+          }
+
+          data[this.submitter.email] = signedUuid
+
+          window.localStorage.setItem('signed_signature_uuids', JSON.stringify(data))
+        }
+      } catch (e) {
+        console.error(e)
+      }
+    },
     async submit () {
       if (this.modelValue || this.computedPreviousValue) {
         if (this.computedPreviousValue) {
@@ -416,6 +568,7 @@ export default {
           formData.append('file', file)
           formData.append('submitter_slug', this.submitterSlug)
           formData.append('name', 'attachments')
+          formData.append('remember_signature', this.rememberSignature)
 
           return fetch(this.baseUrl + '/api/attachments', {
             method: 'POST',
@@ -424,6 +577,8 @@ export default {
             this.$emit('attached', attachment)
             this.$emit('update:model-value', attachment.uuid)
 
+            this.maybeSetSignedUuid(attachment.signed_uuid)
+
             return resolve(attachment)
           })
         }).catch((error) => {

app/javascript/submission_form/text_step.vue

@@ -10,7 +10,9 @@
      :string="field.title"
    />
     <template v-else>{{ field.name }}</template>
-    <template v-if="!field.required">({{ t('optional') }})</template>
+    <template v-if="!field.required">
+      ({{ t('optional') }})
+    </template>
   </label>
   <div
     v-else

app/javascript/template_builder/area.vue

@@ -3,7 +3,7 @@
     class="absolute overflow-visible group"
     :style="positionStyle"
     @pointerdown.stop
-    @mousedown.stop="startDrag"
+    @mousedown="startMouseMove"
     @touchstart="startTouchDrag"
   >
     <div
@@ -65,15 +65,17 @@
         dir="auto"
         class="pr-1 cursor-text outline-none block"
         style="min-width: 2px"
+        @paste.prevent="onPaste"
         @keydown.enter.prevent="onNameEnter"
         @focus="onNameFocus"
         @blur="onNameBlur"
       >{{ optionIndexText }} {{ (defaultField ? (field.title || field.name) : field.name) || defaultName }}</span>
       <div
-        v-if="isSettingsFocus || (isNameFocus && !['checkbox', 'phone'].includes(field.type))"
+        v-if="isSettingsFocus || isContenteditable || (isNameFocus && !['checkbox', 'phone'].includes(field.type))"
         class="flex items-center ml-1.5"
       >
         <input
+          v-if="!isContenteditable"
           :id="`required-checkbox-${field.uuid}`"
           v-model="field.required"
           type="checkbox"
@@ -81,13 +83,30 @@
           @mousedown.prevent
         >
         <label
+          v-if="!isContenteditable"
           :for="`required-checkbox-${field.uuid}`"
           class="label text-xs"
           @click.prevent="field.required = !field.required"
           @mousedown.prevent
         >{{ t('required') }}</label>
+        <input
+          v-if="isContenteditable"
+          :id="`readonly-checkbox-${field.uuid}`"
+          type="checkbox"
+          class="checkbox checkbox-xs no-animation rounded"
+          :checked="!(field.readonly ?? true)"
+          @change="field.readonly = !(field.readonly ?? true)"
+          @mousedown.prevent
+        >
+        <label
+          v-if="isContenteditable"
+          :for="`readonly-checkbox-${field.uuid}`"
+          class="label text-xs"
+          @click.prevent="field.readonly = !(field.readonly ?? true)"
+          @mousedown.prevent
+        >{{ t('editable') }}</label>
         <span
-          v-if="field.type !== 'payment'"
+          v-if="field.type !== 'payment' && !isContenteditable"
           class="dropdown dropdown-end"
           @mouseenter="renderDropdown = true"
           @touchstart="renderDropdown = true"
@@ -140,7 +159,7 @@
     <div
       class="flex items-center h-full w-full"
       dir="auto"
-      :class="[bgColors[submitterIndex], field?.default_value ? (alignClasses[field.preferences?.align] || '') : 'justify-center']"
+      :class="[isContenteditable ? 'bg-opacity-50' : 'bg-opacity-80', bgColors[submitterIndex], isDefaultValuePresent || isContenteditable ? (alignClasses[field.preferences?.align] || '') : 'justify-center']"
     >
       <span
         v-if="field"
@@ -148,7 +167,7 @@
         :class="{'w-full h-full': field.type == 'checkbox'}"
       >
         <div
-          v-if="field?.default_value"
+          v-if="isDefaultValuePresent || isContenteditable"
           :class="{ 'w-full h-full': field.type == 'checkbox', 'text-[1.5vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars }"
         >
           <div
@@ -162,12 +181,19 @@
               :class="{ '!w-auto !h-full': area.w > area.h, '!w-full !h-auto': area.w <= area.h }"
             />
             <span
-              v-else-if="field.type === 'number'"
+              v-else-if="field.type === 'number' && !isContenteditable"
               class="whitespace-pre-wrap"
             >{{ formatNumber(field.default_value, field.preferences?.format) }}</span>
             <span
               v-else
-              class="whitespace-pre-wrap"
+              ref="defaultValue"
+              :contenteditable="isContenteditable"
+              class="whitespace-pre-wrap outline-none empty:before:content-[attr(placeholder)] before:text-gray-400"
+              :class="{ 'cursor-text': isContenteditable }"
+              :placeholder="t('type_value')"
+              @blur="onDefaultValueBlur"
+              @paste.prevent="onPaste"
+              @keydown.enter.prevent="onDefaultValueEnter"
             >{{ field.default_value }}</span>
           </div>
         </div>
@@ -181,8 +207,11 @@
       </span>
     </div>
     <div
+      v-if="!isContenteditable"
       ref="touchTarget"
-      class="absolute top-0 bottom-0 right-0 left-0 cursor-pointer"
+      class="absolute top-0 bottom-0 right-0 left-0"
+      :class="isDragged ? 'cursor-grab' : 'cursor-pointer'"
+      @dblclick="maybeFocusDefaultValue"
     />
     <span
       v-if="field?.type && editable"
@@ -286,6 +315,7 @@ export default {
     return {
       isShowFormulaModal: false,
       isShowConditionsModal: false,
+      isContenteditable: false,
       isSettingsFocus: false,
       isShowDescriptionModal: false,
       isResize: false,
@@ -299,6 +329,9 @@ export default {
   computed: {
     fieldNames: FieldType.computed.fieldNames,
     fieldIcons: FieldType.computed.fieldIcons,
+    isDefaultValuePresent () {
+      return this.field?.default_value || this.field?.default_value === 0
+    },
     modalContainerEl () {
       return this.$el.getRootNode().querySelector('#docuseal_modal_container')
     },
@@ -364,26 +397,26 @@ export default {
     },
     bgColors () {
       return [
-        'bg-red-100/80',
-        'bg-sky-100/80',
-        'bg-emerald-100/80',
-        'bg-yellow-100/80',
-        'bg-purple-100/80',
-        'bg-pink-100/80',
-        'bg-cyan-100/80',
-        'bg-orange-100/80',
-        'bg-lime-100/80',
-        'bg-indigo-100/80',
-        'bg-red-100/80',
-        'bg-sky-100/80',
-        'bg-emerald-100/80',
-        'bg-yellow-100/80',
-        'bg-purple-100/80',
-        'bg-pink-100/80',
-        'bg-cyan-100/80',
-        'bg-orange-100/80',
-        'bg-lime-100/80',
-        'bg-indigo-100/80'
+        'bg-red-100',
+        'bg-sky-100',
+        'bg-emerald-100',
+        'bg-yellow-100',
+        'bg-purple-100',
+        'bg-pink-100',
+        'bg-cyan-100',
+        'bg-orange-100',
+        'bg-lime-100',
+        'bg-indigo-100',
+        'bg-red-100',
+        'bg-sky-100',
+        'bg-emerald-100',
+        'bg-yellow-100',
+        'bg-purple-100',
+        'bg-pink-100',
+        'bg-cyan-100',
+        'bg-orange-100',
+        'bg-lime-100',
+        'bg-indigo-100'
       ]
     },
     isSelected () {
@@ -421,6 +454,22 @@ export default {
     closeDropdown () {
       document.activeElement.blur()
     },
+    maybeFocusDefaultValue () {
+      if (['text', 'number'].includes(this.field.type)) {
+        this.isContenteditable = true
+
+        this.$nextTick(() => {
+          this.$refs.defaultValue.focus()
+
+          if (this.$refs.defaultValue.innerText.length) {
+            window.getSelection().collapse(
+              this.$refs.defaultValue.firstChild,
+              this.$refs.defaultValue.innerText.length
+            )
+          }
+        })
+      }
+    },
     formatNumber (number, format) {
       if (format === 'comma') {
         return new Intl.NumberFormat('en-US').format(number)
@@ -463,6 +512,9 @@ export default {
 
       this.save()
     },
+    onPaste (e) {
+      e.target.innerText = (e.clipboardData || window.clipboardData).getData('text/plain')
+    },
     onResizeCell (e) {
       if (e.target.id === 'mask') {
         const positionX = e.offsetX / (e.target.clientWidth - 1)
@@ -510,6 +562,38 @@ export default {
 
       this.save()
     },
+    onDefaultValueBlur (e) {
+      const text = this.$refs.defaultValue.innerText.trim()
+
+      this.isContenteditable = false
+
+      if (text) {
+        if (this.field.type === 'number') {
+          const number = parseFloat(text)
+
+          if (number || number === 0) {
+            this.field.default_value = parseFloat(text)
+          }
+        } else {
+          this.field.default_value = text
+        }
+
+        if (![true, false].includes(this.field.readonly)) {
+          this.field.readonly = true
+        }
+
+        this.$refs.defaultValue.innerText = text
+      } else {
+        delete this.field.readonly
+        delete this.field.default_value
+        this.$refs.defaultValue.innerText = ''
+      }
+
+      this.save()
+    },
+    onDefaultValueEnter (e) {
+      this.$refs.defaultValue.blur()
+    },
     onNameEnter (e) {
       this.$refs.name.blur()
     },
@@ -548,7 +632,7 @@ export default {
         return
       }
 
-      this.$refs?.name?.blur()
+      document.activeElement?.blur()
 
       e.preventDefault()
 
@@ -569,8 +653,8 @@ export default {
       const page = this.$parent.$refs.mask.previousSibling
       const rect = page.getBoundingClientRect()
 
-      this.area.x = (this.dragFrom.x + e.touches[0].clientX - rect.left) / rect.width
-      this.area.y = (this.dragFrom.y + e.touches[0].clientY - rect.top) / rect.height
+      this.area.x = Math.min(Math.max((this.dragFrom.x + e.touches[0].clientX - rect.left) / rect.width, 0), 1 - this.area.w)
+      this.area.y = Math.min(Math.max((this.dragFrom.y + e.touches[0].clientY - rect.top) / rect.height, 0), 1 - this.area.h)
     },
     stopTouchDrag () {
       this.$el.getRootNode().removeEventListener('touchmove', this.touchDrag)
@@ -584,6 +668,47 @@ export default {
 
       this.$emit('stop-drag')
     },
+    startMouseMove (e) {
+      if (e.target !== this.$refs.touchTarget) {
+        return
+      }
+
+      document.activeElement?.blur()
+
+      e.preventDefault()
+
+      this.isDragged = true
+
+      const rect = e.target.getBoundingClientRect()
+
+      this.selectedAreaRef.value = this.area
+
+      this.dragFrom = { x: rect.left - e.clientX, y: rect.top - e.clientY }
+
+      this.$el.getRootNode().addEventListener('mousemove', this.mouseMove)
+      this.$el.getRootNode().addEventListener('mouseup', this.stopMouseMove)
+
+      this.$emit('start-drag')
+    },
+    mouseMove (e) {
+      const page = this.$parent.$refs.mask.previousSibling
+      const rect = page.getBoundingClientRect()
+
+      this.area.x = Math.min(Math.max((this.dragFrom.x + e.clientX - rect.left) / rect.width, 0), 1 - this.area.w)
+      this.area.y = Math.min(Math.max((this.dragFrom.y + e.clientY - rect.top) / rect.height, 0), 1 - this.area.h)
+    },
+    stopMouseMove (e) {
+      this.$el.getRootNode().removeEventListener('mousemove', this.mouseMove)
+      this.$el.getRootNode().removeEventListener('mouseup', this.stopMouseMove)
+
+      if (this.isDragged) {
+        this.save()
+      }
+
+      this.isDragged = false
+
+      this.$emit('stop-drag')
+    },
     stopDrag () {
       this.$el.getRootNode().removeEventListener('mousemove', this.drag)
       this.$el.getRootNode().removeEventListener('mouseup', this.stopDrag)

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/contenteditable.vue

@@ -10,6 +10,7 @@
       style="min-width: 2px"
       :class="iconInline ? 'inline' : 'block'"
       class="peer outline-none focus:block"
+      @paste.prevent="onPaste"
       @keydown.enter.prevent="blurContenteditable"
       @focus="$emit('focus', $event)"
       @blur="onBlur"
@@ -97,6 +98,9 @@ export default {
     }
   },
   methods: {
+    onPaste (e) {
+      e.target.innerText = (e.clipboardData || window.clipboardData).getData('text/plain')
+    },
     selectContent () {
       const el = this.$refs.contenteditable
 

app/javascript/template_builder/field.vue

@@ -57,7 +57,7 @@
           class="flex items-center space-x-1"
         >
           <button
-            v-if="field && !field.areas.length"
+            v-if="field && !field.areas?.length"
             :title="t('draw')"
             class="relative cursor-pointer text-transparent group-hover:text-base-content"
             @click="$emit('set-draw', { field })"
@@ -92,6 +92,7 @@
           <PaymentSettings
             v-if="field.type === 'payment'"
             :field="field"
+            @click-condition="isShowConditionsModal = true"
           />
           <span
             v-else

app/javascript/template_builder/field_settings.vue

@@ -74,6 +74,66 @@
       {{ t('default_value') }}
     </label>
   </div>
+  <div
+    v-if="['text', 'cells'].includes(field.type)"
+    class="py-1.5 px-1 relative"
+    @click.stop
+  >
+    <select
+      class="select select-bordered select-xs w-full max-w-xs h-7 !outline-0 font-normal bg-transparent"
+      @change="onChangeValidation"
+    >
+      <option
+        :selected="!field.validation"
+        value=""
+      >
+        {{ t('none') }}
+      </option>
+      <option
+        v-for="(key, value) in validations"
+        :key="key"
+        :selected="field.validation?.pattern ? value === field.validation.pattern : value === 'none'"
+        :value="value"
+      >
+        {{ t(key) }}
+      </option>
+      <option
+        :selected="field.validation && !validations[field.validation.pattern]"
+        :value="validations[field.validation?.pattern] || !field.validation?.pattern ? 'custom' : field.validation?.pattern"
+      >
+        {{ t('custom') }}
+      </option>
+    </select>
+    <label
+      :style="{ backgroundColor }"
+      class="absolute -top-1 left-2.5 px-1 h-4"
+      style="font-size: 8px"
+    >
+      {{ t('validation') }}
+    </label>
+  </div>
+  <div
+    v-if="['text', 'cells'].includes(field.type) && field.validation && !validations[field.validation.pattern]"
+    class="py-1.5 px-1 relative"
+    @click.stop
+  >
+    <input
+      ref="validationCustom"
+      v-model="field.validation.pattern"
+      :placeholder="t('regexp_validation')"
+      dir="auto"
+      class="input input-bordered input-xs w-full max-w-xs h-7 !outline-0 bg-transparent"
+      @blur="save"
+    >
+    <label
+      v-if="field.validation.pattern"
+      :style="{ backgroundColor }"
+      class="absolute -top-1 left-2.5 px-1 h-4"
+      style="font-size: 8px"
+    >
+      {{ t('regexp_validation') }}
+    </label>
+  </div>
   <div
     v-if="field.type === 'date'"
     class="py-1.5 px-1 relative"
@@ -393,6 +453,17 @@ export default {
 
       return formats
     },
+    validations () {
+      return {
+        '^[0-9]{3}-[0-9]{2}-[0-9]{4}$': 'ssn',
+        '^[0-9]{2}-[0-9]{7}$': 'ein',
+        '^[^@\\s]+@[^@\\s]+\\.[^@\\s]+$': 'email',
+        '^https?://.*': 'url',
+        '^[0-9]{5}(?:-[0-9]{4})?$': 'zip',
+        '^[0-9]+$': 'numbers_only',
+        '^[a-zA-Z]+$': 'letters_only'
+      }
+    },
     sortedAreas () {
       return (this.field.areas || []).sort((a, b) => {
         return this.schemaAttachmentsIndexes[a.attachment_uuid] - this.schemaAttachmentsIndexes[b.attachment_uuid]
@@ -400,6 +471,20 @@ export default {
     }
   },
   methods: {
+    onChangeValidation (event) {
+      if (event.target.value === 'custom') {
+        this.field.validation = { pattern: '' }
+
+        this.$nextTick(() => this.$refs.validationCustom.focus())
+      } else if (event.target.value) {
+        this.field.validation ||= {}
+        this.field.validation.pattern = event.target.value
+      } else {
+        delete this.field.validation
+      }
+
+      this.save()
+    },
     copyToAllPages (field) {
       const areaString = JSON.stringify(field.areas[0])
 

app/javascript/template_builder/i18n.js

@@ -1,16 +1,19 @@
 const en = {
+  editable: 'Editable',
   search_field: 'Search field',
   field_not_found: 'Field not found',
   clear: 'Clear',
   align: 'Align',
   add_all_required_fields_to_continue: 'Add all required fields to continue',
   left: 'Left',
+  validation: 'Validation',
   right: 'Right',
   center: 'Center',
   description: 'Description',
   display_title: 'Display title',
   with_logo: 'With logo',
   unchecked: 'Unchecked',
+  type_value: 'Type value',
   equal: 'Equal',
   not_equal: 'Not equal',
   contains: 'Contains',
@@ -20,6 +23,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',
@@ -97,7 +101,17 @@ const en = {
   draw_field: 'Draw {field} Field',
   replace: 'Replace',
   uploading_: 'Uploading...',
-  add_document: 'Add Document'
+  add_document: 'Add Document',
+  none: 'None',
+  ssn: 'SSN',
+  ein: 'EIN',
+  email: 'Email',
+  url: 'URL',
+  zip: 'ZIP',
+  custom: 'Custom',
+  numbers_only: 'Numbers only',
+  letters_only: 'Letters only',
+  regexp_validation: 'Regexp validation'
 }
 
 export { en }

app/javascript/template_builder/import_list.vue

@@ -267,7 +267,7 @@ export default {
           if (mapping.field_name && mapping.column_index != null) {
             submittersIndex[mapping.submitter_uuid] ||= { uuid: mapping.submitter_uuid, fields: [] }
 
-            if (['name', 'email', 'phone'].includes(mapping.field_name.toLowerCase())) {
+            if (['name', 'email', 'phone', 'external_id'].includes(mapping.field_name.toLowerCase())) {
               submittersIndex[mapping.submitter_uuid][mapping.field_name.toLowerCase()] = row[mapping.column_index]
             } else {
               submittersIndex[mapping.submitter_uuid].fields.push({
@@ -351,7 +351,13 @@ export default {
           this.defaultFields.every((f) => field.name?.toLowerCase() !== f.name?.toLowerCase())
       })
 
-      return [...this.defaultFields, ...templateFields]
+      const fields = [...this.defaultFields, ...templateFields]
+
+      if (this.spreadsheet && this.columns.includes('external_id')) {
+        fields.push({ name: 'external_id' })
+      }
+
+      return fields
     },
     buildDefaultMappings () {
       this.submitters.forEach((submitter) => {

app/javascript/template_builder/page.vue

@@ -27,8 +27,6 @@
         :default-submitters="defaultSubmitters"
         @start-resize="resizeDirection = $event"
         @stop-resize="resizeDirection = null"
-        @start-drag="isMove = true"
-        @stop-drag="isMove = false"
         @remove="$emit('remove-area', item.area)"
         @scroll-to="$emit('scroll-to', $event)"
       />
@@ -40,11 +38,11 @@
       />
     </div>
     <div
-      v-show="resizeDirection || isMove || isDrag || showMask || (drawField && isMobile) || fieldsDragFieldRef.value"
+      v-show="resizeDirection || isDrag || showMask || (drawField && isMobile) || fieldsDragFieldRef.value"
       id="mask"
       ref="mask"
       class="top-0 bottom-0 left-0 right-0 absolute"
-      :class="{ 'z-10': !isMobile, 'cursor-grab': isDrag || isMove, 'cursor-nwse-resize': drawField, [resizeDirectionClasses[resizeDirection]]: !!resizeDirectionClasses }"
+      :class="{ 'z-10': !isMobile, 'cursor-grab': isDrag, 'cursor-nwse-resize': drawField, [resizeDirectionClasses[resizeDirection]]: !!resizeDirectionClasses }"
       @pointermove="onPointermove"
       @pointerdown="onStartDraw"
       @dragover.prevent
@@ -122,7 +120,6 @@ export default {
     return {
       areaRefs: [],
       showMask: false,
-      isMove: false,
       resizeDirection: null,
       newArea: null
     }

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/jobs/process_submitter_completion_job.rb

@@ -33,19 +33,25 @@ class ProcessSubmitterCompletionJob < ApplicationJob
         SubmitterMailer.completed_email(submitter, user).deliver_later!
       end
 
-      bcc = submission.preferences['bcc_completed'].presence ||
-            submission.template.preferences['bcc_completed'].presence ||
-            submission.account.account_configs
-                      .find_by(key: AccountConfig::BCC_EMAILS)&.value
-
-      bcc.to_s.scan(User::EMAIL_REGEXP).each do |to|
+      build_bcc_addresses(submission).each do |to|
         SubmitterMailer.completed_email(submitter, user, to:).deliver_later!
       end
     end
 
     to = build_to_addresses(submitter)
 
-    SubmitterMailer.documents_copy_email(submitter, to:).deliver_later! if to.present?
+    return if to.blank? || submitter.template.preferences['documents_copy_email_enabled'] == false
+
+    SubmitterMailer.documents_copy_email(submitter, to:).deliver_later!
+  end
+
+  def build_bcc_addresses(submission)
+    bcc = submission.preferences['bcc_completed'].presence ||
+          submission.template.preferences['bcc_completed'].presence ||
+          submission.account.account_configs
+                    .find_by(key: AccountConfig::BCC_EMAILS)&.value
+
+    bcc.to_s.scan(User::EMAIL_REGEXP)
   end
 
   def build_to_addresses(submitter)

app/jobs/send_form_completed_webhook_request_job.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SendFormCompletedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10

app/jobs/send_form_started_webhook_request_job.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SendFormStartedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10

app/jobs/send_form_viewed_webhook_request_job.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SendFormViewedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10

app/jobs/send_submission_archived_webhook_request_job.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SendSubmissionArchivedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10

app/jobs/send_submission_created_webhook_request_job.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SendSubmissionCreatedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10

app/jobs/send_template_created_webhook_request_job.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SendTemplateCreatedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10

app/jobs/send_template_updated_webhook_request_job.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SendTemplateUpdatedWebhookRequestJob < ApplicationJob
+  queue_as :webhooks
+
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10

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/account_config.rb

@@ -32,6 +32,7 @@ class AccountConfig < ApplicationRecord
   FORM_COMPLETED_BUTTON_KEY = 'form_completed_button'
   FORM_COMPLETED_MESSAGE_KEY = 'form_completed_message'
   FORM_WITH_CONFETTI_KEY = 'form_with_confetti'
+  FORM_PREFILL_SIGNATURE_KEY = 'form_prefill_signature'
   ESIGNING_PREFERENCE_KEY = 'esigning_preference'
   WEBHOOK_PREFERENCES_KEY = 'webhook_preferences'
   DOWNLOAD_LINKS_AUTH_KEY = 'download_links_auth'

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/models/submission.rb

@@ -52,6 +52,7 @@ class Submission < ApplicationRecord
   attribute :slug, :string, default: -> { SecureRandom.base58(14) }
 
   has_one_attached :audit_trail
+  has_one_attached :combined_document
 
   has_many :template_schema_documents,
            ->(e) { where(uuid: (e.template_schema.presence || e.template.schema).pluck('attachment_uuid')) },

app/models/user.rb

@@ -50,6 +50,7 @@ class User < ApplicationRecord
   EMAIL_REGEXP = /[^@;,<>\s]+@[^@;,<>\s]+/
 
   has_one_attached :signature
+  has_one_attached :initials
 
   belongs_to :account
   has_one :access_token, dependent: :destroy

app/models/user_config.rb

@@ -22,6 +22,7 @@
 #
 class UserConfig < ApplicationRecord
   SIGNATURE_KEY = 'signature'
+  INITIALS_KEY = 'initials'
   RECEIVE_COMPLETED_EMAIL = 'receive_completed_email'
 
   belongs_to :user

app/views/accounts/show.html.erb

@@ -75,6 +75,18 @@
             </div>
           <% end %>
         <% end %>
+        <% account_config = AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::FORM_PREFILL_SIGNATURE_KEY) %>
+        <% if can?(:manage, account_config) %>
+          <%= form_for account_config, url: account_configs_path, method: :post do |f| %>
+            <%= f.hidden_field :key %>
+            <div class="flex items-center justify-between py-2.5">
+              <span>
+                Remember and pre-fill signatures
+              </span>
+              <%= f.check_box :value, class: 'toggle', checked: account_config.value != false, onchange: 'this.form.requestSubmit()' %>
+            </div>
+          <% end %>
+        <% end %>
         <% account_config = AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::DOWNLOAD_LINKS_AUTH_KEY) %>
         <% if can?(:manage, account_config) %>
           <%= form_for account_config, url: account_configs_path, method: :post do |f| %>
@@ -89,6 +101,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/icons/_chevron_down.html.erb

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+  <path d="M6 9l6 6l6 -6" />
+</svg>

app/views/layouts/_head_tags.html.erb

@@ -1,4 +1,4 @@
 <title>
-  DocuSeal | Open Source Document Filling and Signing
+  <%= content_for(:html_title) || 'DocuSeal | Open Source Document Signing' %>
 </title>
 <%= render 'shared/meta' %>

app/views/layouts/application.html.erb

@@ -1,11 +1,16 @@
 <!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">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
-    <%= javascript_pack_tag 'application', defer: true %>
+    <% if ENV['ROLLBAR_CLIENT_TOKEN'] %>
+      <meta name="rollbar-token" content="<%= ENV.fetch('ROLLBAR_CLIENT_TOKEN', nil) %>">
+      <%= javascript_pack_tag 'rollbar', 'application', defer: true %>
+    <% else %>
+      <%= javascript_pack_tag 'application', defer: true %>
+    <% end %>
     <%= stylesheet_pack_tag 'application', media: 'all' %>
     <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
     <%= render 'shared/plausible' if !signed_in? && ENV['PLAUSIBLE_DOMAIN'] %>

app/views/layouts/form.html.erb

@@ -1,11 +1,16 @@
 <!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">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
-    <%= javascript_pack_tag 'form', defer: true %>
+    <% if ENV['ROLLBAR_CLIENT_TOKEN'] %>
+      <meta name="rollbar-token" content="<%= ENV.fetch('ROLLBAR_CLIENT_TOKEN', nil) %>">
+      <%= javascript_pack_tag 'rollbar', 'form', defer: true %>
+    <% else %>
+      <%= javascript_pack_tag 'form', defer: true %>
+    <% end %>
     <%= stylesheet_pack_tag 'form', media: 'all' %>
     <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
   </head>

app/views/layouts/plain.html.erb

@@ -1,11 +1,16 @@
 <!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">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
-    <%= javascript_pack_tag 'application', defer: true %>
+    <% if ENV['ROLLBAR_CLIENT_TOKEN'] %>
+      <meta name="rollbar-token" content="<%= ENV.fetch('ROLLBAR_CLIENT_TOKEN', nil) %>">
+      <%= javascript_pack_tag 'rollbar', 'application', defer: true %>
+    <% else %>
+      <%= javascript_pack_tag 'application', defer: true %>
+    <% end %>
     <%= stylesheet_pack_tag 'application', media: 'all' %>
     <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
   </head>

app/views/profile/index.html.erb

@@ -31,6 +31,15 @@
       </div>
     <% end %>
     <a href="<%= edit_user_signature_path %>" data-turbo-frame="modal" class="base-button w-full">Update Signature</a>
+    <p class="text-2xl font-bold mt-8 mb-4">Initials</p>
+    <% initials = UserConfigs.load_initials(current_user) %>
+    <% if initials %>
+      <div class="flex justify-center mb-4 relative">
+        <%= button_to button_title(title: 'Remove', disabled_with: 'Removing'), user_initials_path, method: :delete, class: 'right-0 top-0 absolute link' %>
+        <img src="<%= initials.url %>" style="max-height: 200px; width: auto" width="<%= initials.metadata['width'] %>" height="<%= initials.metadata['height'] %>">
+      </div>
+    <% end %>
+    <a href="<%= edit_user_initials_path %>" data-turbo-frame="modal" class="base-button w-full">Update Initials</a>
     <% if true_user == current_user && !current_account.testing? %>
       <p class="text-2xl font-bold mt-8 mb-4">Change Password</p>
       <%= form_for current_user, url: update_password_settings_profile_index_path, method: :patch, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>

app/views/shared/_meta.html.erb

@@ -1,21 +1,25 @@
 <% if Docuseal.demo? || (request.path != '/' && !devise_controller?) %>
   <meta name="robots" content="noindex">
 <% end %>
-<meta name="description" content="Open source, self-hosted tool to streamline document filling and signing. Create custom PDF forms to complete and sign with an easy to use online tool.">
-<meta property="og:title" content="DocuSeal | Open Source Document Filling and Signing">
-<meta property="og:description" content="Open source, self-hosted tool to streamline document filling and signing. Create custom PDF forms to complete and sign with an easy to use online tool.">
+<% title = content_for(:html_title) || 'DocuSeal | Open Source Document Filling and Signing' %>
+<% description = content_for(:html_description) || 'Open source, self-hosted tool to streamline document filling and signing. Create custom PDF forms to complete and sign with an easy to use online tool.' %>
+<meta name="description" content="<%= description %>">
+<meta property="og:title" content="<%= title %>">
+<meta property="og:description" content="<%= description %>">
 <meta property="og:type" content="website">
 <meta property="og:url" content="<%= root_url %>">
 <meta property="og:site_name" content="DocuSeal">
-<meta property="og:image" content="<%= image_pack_url('images/preview.png') %>">
-<meta property="og:image:width" content="800">
-<meta property="og:image:height" content="800">
-<meta name="twitter:image" content="<%= image_pack_url('images/preview.png') %>">
+<% unless content_for(:disable_image_preview) %>
+  <meta property="og:image" content="<%= image_pack_url('images/preview.png') %>">
+  <meta property="og:image:width" content="800">
+  <meta property="og:image:height" content="800">
+  <meta name="twitter:image" content="<%= image_pack_url('images/preview.png') %>">
+<% end %>
 <meta name="twitter:card" content="summary">
 <meta name="twitter:creator" content="@docusealco">
 <meta name="twitter:site" content="@docusealco">
-<meta name="twitter:title" content="DocuSeal | Open Source Document Filling and Signing">
-<meta name="twitter:description" content="Open source, self-hosted tool to streamline document filling and signing. Create custom PDF forms to complete and sign with an easy to use online tool.">
+<meta name="twitter:title" content="<%= title %>">
+<meta name="twitter:description" content="<%= description %>">
 <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
 <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
 <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">

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' %>
@@ -26,10 +26,10 @@
         <label tabindex="0" class="cursor-pointer bg-base-content text-purple-300 rounded-full p-2 w-9 justify-center flex">
           <span class="text-sm align-text-top"><%= current_user.initials %></span>
         </label>
-        <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box whitespace-nowrap text-right">
+        <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box w-40 text-right">
           <li>
             <%= link_to settings_profile_index_path, class: 'flex items-center' do %>
-              <%= svg_icon('adjustments', class: 'w-5 h-5 stroke-2') %>
+              <%= svg_icon('adjustments', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
               <span class="mr-1">Profile</span>
             <% end %>
           </li>
@@ -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/start_form/completed.html.erb

@@ -20,14 +20,14 @@
       <%= t('form_has_been_submitted_already') %>
     </div>
     <% if Docuseal.multitenant? || Accounts.can_send_emails?(@submitter.account) %>
-      <div>
-        <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'base-button w-full' %>
-      </div>
+      <toggle-submit class="block">
+        <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, class: 'base-button w-full' %>
+      </toggle-submit>
     <% end %>
     <% if @template.submitters.to_a.size == 1 && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false %>
-      <div>
-        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: { email: params[:email] }, resubmit: @submitter.slug }, method: :put, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
-      </div>
+      <toggle-submit class="block">
+        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: { email: params[:email] }, resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>
+      </toggle-submit>
     <% end %>
   </div>
 </div>

app/views/start_form/show.html.erb

@@ -1,3 +1,5 @@
+<% content_for(:html_title, "#{@template.name} | DocuSeal") %>
+<% content_for(:html_description, "#{@template.account.name} has invited you to fill and sign documents online effortlessly with a secure, fast, and user-friendly digital document signing solution.") %>
 <div class="max-w-md mx-auto px-2 mt-12 mb-4">
   <div class="space-y-6 mx-auto">
     <div class="space-y-6">
@@ -24,15 +26,15 @@
       </div>
     </div>
     <% unless @template.archived_at? %>
-      <%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4', onsubmit: 'event.submitter.disabled = true' } do |f| %>
+      <%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %>
         <div dir="auto" class="form-control !mt-0">
           <%= f.label :email, t('email'), class: 'label' %>
           <%= f.email_field :email, value: current_user&.email || params[:email] || @submitter.email, required: true, class: 'base-input', placeholder: t('provide_your_email_to_start') %>
           <%= @error_message %>
         </div>
-        <div dir="auto" class="form-control">
+        <toggle-submit dir="auto" class="form-control">
           <%= f.button button_title(title: t('start'), disabled_with: t('starting')), class: 'base-button' %>
-        </div>
+        </toggle-submit>
       <% end %>
     <% end %>
   </div>

app/views/submissions/show.html.erb

@@ -1,3 +1,6 @@
+<% if params[:controller] == 'submissions_preview' %>
+  <%= render 'submissions/preview_tags' %>
+<% end %>
 <div style="max-width: 1600px" class="mx-auto pl-4">
   <div class="flex justify-between py-1.5 items-center pr-4 sticky top-0 md:relative z-10 bg-base-100">
     <a href="<%= signed_in? && @submission.account_id == current_account&.id ? template_path(@submission.template) : '/' %>" class="flex items-center space-x-3 py-1">
@@ -14,16 +17,42 @@
         </a>
       <% end %>
       <% if last_submitter = @submission.submitters.to_a.select(&:completed_at?).max_by(&:completed_at) %>
-        <download-button data-src="<%= submitter_download_index_path(last_submitter.slug, { sig: params[:sig] }.compact) %>" class="base-button">
-          <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
-            <%= svg_icon('download', class: 'w-6 h-6') %>
-            <span class="hidden md:inline">Download</span>
-          </span>
-          <span class="flex items-center justify-center space-x-2 hidden" data-target="download-button.loadingButton">
-            <%= svg_icon('loader', class: 'w-6 h-6 animate-spin') %>
-            <span class="hidden md:inline">Downloading</span>
-          </span>
-        </download-button>
+        <% is_all_completed = @submission.submitters.to_a.all?(&:completed_at?) %>
+        <div class="join relative">
+          <download-button data-src="<%= submitter_download_index_path(last_submitter.slug, { sig: params[:sig] }.compact) %>" class="base-button <%= '!rounded-r-none !pr-2' if is_all_completed %>">
+            <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
+              <%= svg_icon('download', class: 'w-6 h-6') %>
+              <span class="hidden md:inline">Download</span>
+            </span>
+            <span class="flex items-center justify-center space-x-2 hidden" data-target="download-button.loadingButton">
+              <%= svg_icon('loader', class: 'w-6 h-6 animate-spin') %>
+              <span class="hidden md:inline">Downloading</span>
+            </span>
+          </download-button>
+          <% if is_all_completed %>
+            <div class="dropdown dropdown-end">
+              <label tabindex="0" class="base-button !rounded-l-none !pl-1 !pr-2 !border-l-neutral-500">
+                <span class="text-sm align-text-top">
+                  <%= svg_icon('chevron_down', class: 'w-6 h-6 flex-shrink-0 stroke-2') %>
+                </span>
+              </label>
+              <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box text-right">
+                <li>
+                  <download-button data-src="<%= submitter_download_index_path(last_submitter.slug, { sig: params[:sig], combined: true }.compact) %>" class="flex items-center">
+                    <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
+                      <%= svg_icon('download', class: 'w-6 h-6 flex-shrink-0') %>
+                      <span class="whitespace-nowrap">Download combined PDF</span>
+                    </span>
+                    <span class="flex items-center justify-center space-x-2 hidden" data-target="download-button.loadingButton">
+                      <%= svg_icon('loader', class: 'w-6 h-6 animate-spin') %>
+                      <span>Downloading</span>
+                    </span>
+                  </download-button>
+                </li>
+              </ul>
+            </div>
+          <% end %>
+        </div>
       <% elsif @submission.submitters.to_a.size == 1 %>
         <%= render 'shared/clipboard_copy', text: start_form_url(slug: @submission.template.slug), class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy Share Link', copied_title: 'Copied to Clipboard' %>
       <% end %>
@@ -77,7 +106,7 @@
       <% submitter_field_counters = Hash.new { 0 } %>
       <% (@submission.template_submitters || @submission.template.submitters).each_with_index do |item, index| %>
         <% submitter = @submission.submitters.find { |e| e.uuid == item['uuid'] } %>
-        <div class="sticky -top-1 bg-base-100 pt-1 -mt-1 z-10">
+        <div class="sticky -top-1 bg-base-100 pt-1 -mt-1">
           <div class="border border-base-300 rounded-md px-2 py-1 mb-1">
             <div class="flex items-center space-x-1">
               <span class="mx-1 w-3 h-3 rounded-full <%= colors[index] %>"></span>
@@ -115,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

app/views/submissions_preview/completed.html.erb

@@ -1,3 +1,4 @@
+<%= render 'submissions/preview_tags' %>
 <div class="max-w-md mx-auto px-2 mt-12 mb-4">
   <div class="space-y-6 mx-auto">
     <div class="space-y-6">
@@ -21,15 +22,15 @@
       </div>
     </div>
     <% if Docuseal.multitenant? || Accounts.can_send_emails?(@submission.account) %>
-      <%= form_for '', url: send_submission_email_index_path, method: :post, html: { class: 'space-y-4', onsubmit: 'event.submitter.disabled = true' } do |f| %>
+      <%= form_for '', url: send_submission_email_index_path, method: :post, html: { class: 'space-y-4' } do |f| %>
         <div dir="auto" class="form-control !mt-0">
           <%= f.hidden_field :submission_slug, value: @submission.slug %>
           <%= f.label :email, t('email'), class: 'label' %>
           <%= f.email_field :email, value: current_user&.email || params[:email], required: true, class: 'base-input', placeholder: t('send_copy_to_email') %>
         </div>
-        <div dir="auto" class="form-control">
+        <toggle-submit dir="auto" class="form-control">
           <%= f.button button_title(title: t('send_copy_to_email'), disabled_with: t('starting')), class: 'base-button' %>
-        </div>
+        </toggle-submit>
       <% end %>
       <% if Docuseal.multitenant? %>
         <div class="divider uppercase"><%= t('or') %></div>

app/views/submit_form/_submission_form.html.erb

@@ -1,4 +1,3 @@
 <% data_attachments = attachments_index.values.select { |e| e.record_id == submitter.id }.to_json(only: %i[uuid], methods: %i[url filename content_type]) %>
 <% data_fields = (submitter.submission.template_fields || submitter.submission.template.fields).select { |f| f['submitter_uuid'] == submitter.uuid }.to_json %>
-<% configs = Submitters::FormConfigs.call(submitter) %>
-<submission-form data-is-demo="<%= Docuseal.demo? %>" data-with-confetti="<%= configs[:with_confetti] %>" data-completed-redirect-url="<%= submitter.preferences['completed_redirect_url'] %>" data-completed-message="<%= configs[:completed_message].to_json %>" data-completed-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.preferences.key?('go_to_last') ? submitter.preferences['go_to_last'] : submitter.opened_at? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(submitter.submission.account) %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>"></submission-form>
+<submission-form data-is-demo="<%= Docuseal.demo? %>" data-with-confetti="<%= configs[:with_confetti] %>" data-completed-redirect-url="<%= submitter.preferences['completed_redirect_url'] %>" data-completed-message="<%= configs[:completed_message].to_json %>" data-completed-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.preferences.key?('go_to_last') ? submitter.preferences['go_to_last'] : submitter.opened_at? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(submitter.submission.account) %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>" data-previous-signature-value="<%= local_assigns[:signature_attachment]&.uuid %>" data-remember-signature="<%= configs[:prefill_signature] %>"></submission-form>

app/views/submit_form/completed.html.erb

@@ -18,7 +18,9 @@
     </div>
     <div>
       <% if (Docuseal.multitenant? || Accounts.can_send_emails?(@submitter.account)) && @submitter.email.present? %>
-        <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
+        <toggle-submit>
+          <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, class: 'white-button w-full' %>
+        </toggle-submit>
         <% if @submitter.submission.template.submitters.size != 1 %>
           <div class="divider uppercase"><%= t('or') %></div>
         <% else %>
@@ -40,9 +42,9 @@
     </div>
     <% if @submitter.submission.template.submitters.size == 1 && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && !@submitter.template.archived_at? %>
       <div class="divider uppercase"><%= t('or') %></div>
-      <div>
-        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@submitter.submission.template.slug), params: { submitter: { email: @submitter.email, phone: @submitter.phone, name: @submitter.name }, resubmit: @submitter.slug }, method: :put, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
-      </div>
+      <toggle-submit class="block">
+        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@submitter.submission.template.slug), params: { submitter: { email: @submitter.email, phone: @submitter.phone, name: @submitter.name }, resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>
+      </toggle-submit>
     <% end %>
   </div>
 </div>

app/views/submit_form/show.html.erb

@@ -1,6 +1,7 @@
+<% content_for(:html_title, "#{@submitter.submission.template.name} | DocuSeal") %>
+<% content_for(:html_description, "#{@submitter.account.name} has invited you to fill and sign documents online effortlessly with a secure, fast, and user-friendly digital document signing solution.") %>
 <% fields_index = Templates.build_field_areas_index(@submitter.submission.template_fields || @submitter.submission.template.fields) %>
 <% values = @submitter.submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) } %>
-<% attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments).preload(:blob).index_by(&:uuid) %>
 <% page_blob_struct = Struct.new(:url, :metadata, keyword_init: true) %>
 <div style="max-height: -webkit-fill-available;">
   <div id="scrollbox">
@@ -27,7 +28,7 @@
                 <% next if field['redacted'] && field['submitter_uuid'] != @submitter.uuid %>
                 <% next if value == '{{date}}' && field['submitter_uuid'] != @submitter.uuid %>
                 <% next if field.dig('preferences', 'formula') && field['submitter_uuid'] == @submitter.uuid %>
-                <%= render 'submissions/value', area:, field:, attachments_index:, value:, locale: @submitter.account.locale, timezone: @submitter.account.timezone %>
+                <%= render 'submissions/value', area:, field:, attachments_index: @attachments_index, value:, locale: @submitter.account.locale, timezone: @submitter.account.timezone %>
               <% end %>
             </div>
           </div>
@@ -40,7 +41,7 @@
 <div class="fixed bottom-0 w-full h-0 z-20">
   <div class="mx-auto" style="max-width: 1000px">
     <div class="relative md:mx-32">
-      <%= render 'submission_form', attachments_index:, submitter: @submitter %>
+      <%= render 'submission_form', attachments_index: @attachments_index, submitter: @submitter, signature_attachment: @signature_attachment, configs: @form_configs %>
     </div>
   </div>
 </div>

app/views/submit_form_draw_signature/show.html.erb

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html data-theme="docuseal" lang="en">
+  <head>
+    <%= render 'layouts/head_tags' %>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+    <% if ENV['ROLLBAR_CLIENT_TOKEN'] %>
+      <meta name="rollbar-token" content="<%= ENV.fetch('ROLLBAR_CLIENT_TOKEN', nil) %>">
+      <%= javascript_pack_tag 'rollbar', 'draw', defer: true %>
+    <% else %>
+      <%= javascript_pack_tag 'draw', defer: true %>
+    <% end %>
+    <%= stylesheet_pack_tag 'form', media: 'all' %>
+    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
+  </head>
+  <body>
+    <draw-signature data-slug="<%= params[:slug] %>" class="flex items-center h-screen p-2 justify-center">
+      <%= form_for '', url: submit_form_path(params[:slug]), html: { style: 'max-width: 900px; width: 100%; margin-bottom: 120px' }, method: :put do |f| %>
+        <input value="" type="hidden" name="values[<%= (@submitter.submission.template_fields || @submitter.template.fields).find { |f| f['type'] == 'signature' && f['uuid'].starts_with?(params[:f]) }['uuid'] %>]">
+        <div class="font-semibold text-4xl text-center w-full mb-2">
+          Draw Signature
+        </div>
+        <div class="w-full bg-white rounded-2xl border relative" style="height: 300px">
+          <canvas class="w-full"></canvas>
+          <button aria-label="Clear" class="btn btn-ghost btn-sm font-medium top-0 right-0 absolute mt-1 mr-1">
+            <%= svg_icon('reload', class: 'w-5 h-5') %>
+            <span class="inline">Clear</span>
+          </button>
+        </div>
+        <div class="mt-4">
+          <button disabled class="base-button w-full">
+            Submit
+          </button>
+          <%= f.button button_title(title: 'Submit'), class: 'base-button w-full', style: 'display: none' %>
+        </div>
+      <% end %>
+      <div id="success" class="text-center p-2 hidden" style="margin-bottom: 100px">
+        <div class="flex items-center space-x-1 items-center justify-center text-2xl font-semibold mb-2">
+          <%= svg_icon('circle_check', class: 'text-green-600') %>
+          <span>
+            Signature Uploaded
+          </span>
+        </div>
+        <div>
+          Return back to your desktop device to complete the form or <a class="link" href="<%= submit_form_path(params[:slug]) %>">continue on mobile</a>
+        </div>
+      </div>
+    </draw-signature>
+  </body>
+</html>

app/views/templates/_dropzone.html.erb

@@ -23,7 +23,7 @@
             </div>
           </span>
         </div>
-        <input id="file_dropzone_input" name="files[]" class="hidden" data-action="change:file-dropzone#onSelectFiles" data-target="file-dropzone.input" type="file" accept="image/*, application/pdf<%= ', .docx, .doc, .xlsx, .xls' if Docuseal.multitenant? %>" multiple>
+        <input id="file_dropzone_input" name="files[]" class="hidden" data-action="change:file-dropzone#onSelectFiles" data-target="file-dropzone.input" type="file" accept="image/*, application/pdf<%= ', .docx, .doc, .xlsx, .xls, .odt, .rtf' if Docuseal.multitenant? %>" multiple>
       </div>
     </label>
   </file-dropzone>

app/views/templates/_upload_button.html.erb

@@ -14,6 +14,6 @@
     </span>
   </button>
   <input type="hidden" name="form_id" value="<%= form_id %>">
-  <input id="upload_template" name="files[]" class="hidden" onchange="this.form.requestSubmit()" type="file" accept="image/*, application/pdf<%= ', .docx, .doc, .xlsx, .xls' if Docuseal.multitenant? %>" multiple>
+  <input id="upload_template" name="files[]" class="hidden" onchange="this.form.requestSubmit()" type="file" accept="image/*, application/pdf<%= ', .docx, .doc, .xlsx, .xls, .odt, .rtf' if Docuseal.multitenant? %>" multiple>
   <input hidden name="folder_name" value="<%= local_assigns[:folder_name] %>">
 <% end %>

app/views/templates_preferences/show.html.erb

@@ -82,7 +82,7 @@
         <div class="collapse-content">
           <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-1' } do |f| %>
             <toggle-on-submit data-element-id="email_saved_alert2"></toggle-on-submit>
-            <%= f.fields_for :preferences, Struct.new(:documents_copy_email_subject, :documents_copy_email_body).new(*(@template.preferences.values_at('documents_copy_email_subject', 'documents_copy_email_body').compact_blank.presence || AccountConfigs.find_or_initialize_for_key(current_account, AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY).value.values_at('subject', 'body'))) do |ff| %>
+            <%= f.fields_for :preferences, Struct.new(:documents_copy_email_subject, :documents_copy_email_body, :documents_copy_email_enabled).new(*(@template.preferences.values_at('documents_copy_email_subject', 'documents_copy_email_body').compact_blank.presence || AccountConfigs.find_or_initialize_for_key(current_account, AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY).value.values_at('subject', 'body')), @template.preferences['documents_copy_email_enabled']) do |ff| %>
               <div class="form-control">
                 <%= ff.label :documents_copy_email_subject, 'Email subject', class: 'label' %>
                 <%= ff.text_field :documents_copy_email_subject, required: true, class: 'base-input', dir: 'auto' %>
@@ -98,6 +98,12 @@
                   <%= ff.text_area :documents_copy_email_body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
                 </autoresize-textarea>
               </div>
+              <div class="flex items-center justify-between py-2.5 px-1 mb-2">
+                <span>
+                  Send emails automatically on completion
+                </span>
+                <%= ff.check_box :documents_copy_email_enabled, { checked: ff.object.documents_copy_email_enabled != false, class: 'toggle', onchange: 'this.form.requestSubmit()' }, 'true', 'false' %>
+              </div>
             <% end %>
             <div class="form-control pt-2">
               <%= f.button button_title(title: 'Save', disabled_with: 'Saving'), class: 'base-button' %>

app/views/user_initials/edit.html.erb

@@ -0,0 +1,55 @@
+<%= render 'shared/turbo_modal', title: 'Update Initials' do %>
+  <% options = [%w[Draw draw], %w[Upload upload]] %>
+  <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center mt-4 block">
+    <div class="join">
+      <% options.each_with_index do |(label, value), index| %>
+        <span>
+          <%= radio_button_tag 'option', value, value == 'draw', class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
+          <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-focus btn-sm join-item md:w-28 peer-checked:btn-active normal-case">
+            <%= label %>
+          </label>
+        </span>
+      <% end %>
+    </div>
+  </toggle-visible>
+  <div id="draw" class="mt-3">
+    <%= form_for @user_config, url: user_initials_path, method: :put, data: { turbo_frame: :_top }, html: { autocomplete: :off, enctype: 'multipart/form-data' } do |f| %>
+      <signature-form class="relative block">
+        <a class="absolute top-1 right-1 link text-sm" data-target="signature-form.clear" href="#">Clear</a>
+        <canvas data-target="signature-form.canvas" class="bg-white border border-base-300 rounded"></canvas>
+        <input name="file" class="hidden" data-target="signature-form.input" type="file" accept="image/png,image/jpeg,image/jpg">
+        <div class="form-control mt-4">
+          <%= f.button button_title(title: 'Save', disabled_with: 'Saving'), class: 'base-button', data: { target: 'signature-form.button' } %>
+        </div>
+      </signature-form>
+    <% end %>
+  </div>
+  <div id="upload" class="hidden mt-3">
+    <%= form_for @user_config, url: user_initials_path, method: :put, data: { turbo_frame: :_top }, html: { autocomplete: :off, enctype: 'multipart/form-data' } do |f| %>
+      <file-dropzone data-submit-on-upload="true" class="w-full">
+        <label for="file" class="w-full block h-32 relative bg-base-200 hover:bg-base-200/70 rounded-md border border-base-content border-dashed">
+          <div class="absolute top-0 right-0 left-0 bottom-0 flex items-center justify-center">
+            <div class="flex flex-col items-center">
+              <span data-target="file-dropzone.icon">
+                <%= svg_icon('cloud_upload', class: 'w-10 h-10') %>
+              </span>
+              <span data-target="file-dropzone.loading" class="hidden">
+                <%= svg_icon('loader', class: 'w-10 h-10 animate-spin') %>
+              </span>
+              <div class="font-medium mb-1">
+                Upload Initials
+              </div>
+              <div class="text-xs">
+                <span class="font-medium">Click to upload</span> or drag and drop
+              </div>
+            </div>
+            <input id="file" name="file" class="hidden" data-action="change:file-dropzone#onSelectFiles" data-target="file-dropzone.input" type="file" accept="image/png,image/jpeg,image/jpg">
+          </div>
+        </label>
+      </file-dropzone>
+      <div class="form-control mt-4">
+        <%= f.button button_title(title: 'Save', disabled_with: 'Saving'), class: 'base-button' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

app/views/users/_form.html.erb

@@ -19,6 +19,9 @@
     <% if f.object != current_user %>
       <%= render 'role_select', f: %>
     <% end %>
+    <% if local_assigns[:extra_fields_html].present? %>
+      <%= local_assigns[:extra_fields_html] %>
+    <% end %>
   </div>
   <div class="form-control pt-2">
     <%= f.button button_title, class: 'base-button' %>

app/views/users/index.html.erb

@@ -5,9 +5,14 @@
       <h1 class="text-4xl font-bold"><%= params[:status].to_s.titleize %> Users</h1>
       <div class="flex items-center space-x-4">
         <% if can?(:create, User.new(account: current_account)) %>
-          <%= link_to new_user_path, class: 'btn btn-primary btn-md gap-2', data: { turbo_frame: 'modal' } do %>
-            <%= svg_icon('plus', class: 'w-6 h-6') %>
-            <span>New User</span>
+          <%= render 'users/extra_buttons' %>
+          <% if content_for(:add_user_button) %>
+            <%= content_for(:add_user_button) %>
+          <% else %>
+            <%= link_to new_user_path, class: 'btn btn-primary btn-md gap-2', data: { turbo_frame: 'modal' } do %>
+              <%= svg_icon('plus', class: 'w-6 h-6') %>
+              <span>New User</span>
+            <% end %>
           <% end %>
         <% end %>
       </div>
@@ -50,7 +55,7 @@
                 <%= user.last_sign_in_at ? l(user.last_sign_in_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) : '-' %>
               </td>
               <td class="flex items-center space-x-2 justify-end">
-                <% if can?(:update, user) %>
+                <% if can?(:update, user) && user.archived_at.blank? %>
                   <%= link_to edit_user_path(user), class: 'btn btn-outline btn-xs', title: 'Edit', data: { turbo_frame: 'modal' } do %>
                     Edit
                   <% end %>
@@ -61,7 +66,7 @@
                   <% end %>
                 <% end %>
                 <% if params[:status].present? && can?(:manage, user) && user != current_user %>
-                  <%= button_to user_path(user), method: :put, params: { user: { archived_at: nil } }, class: 'btn btn-outline btn-secondary btn-xs', title: 'Unarchive', data: { turbo_confirm: 'Are you sure?' } do %>
+                  <%= button_to user_path(user), method: :put, params: { user: { archived_at: nil } }, class: 'btn btn-outline btn-xs', title: 'Unarchive', data: { turbo_confirm: 'Are you sure?' } do %>
                     Unarchive
                   <% end %>
                 <% end %>

config/application.rb

@@ -11,6 +11,7 @@ require 'active_job/railtie'
 require 'rails/health_controller'
 
 require_relative '../lib/api_path_consider_json_middleware'
+require_relative '../lib/normalize_client_ip_middleware'
 
 Bundler.require(*Rails.groups)
 
@@ -32,6 +33,7 @@ module DocuSeal
     config.action_view.frozen_string_literal = true
 
     config.middleware.insert_before ActionDispatch::Static, Rack::Deflater
+    config.middleware.insert_before ActionDispatch::Static, NormalizeClientIpMiddleware
     config.middleware.insert_before ActionDispatch::Static, ApiPathConsiderJsonMiddleware
 
     config.generators.system_tests = nil

config/environments/development.rb

@@ -2,6 +2,8 @@
 
 require 'active_support/core_ext/integer/time'
 
+Rails.backtrace_cleaner.remove_silencers!
+
 Rails.application.configure do
   config.after_initialize do
     Bullet.enable        = true

config/environments/production.rb

@@ -3,6 +3,8 @@
 require 'active_support/core_ext/integer/time'
 require 'active_support/core_ext/string'
 
+Rails.backtrace_cleaner.remove_silencers!
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -52,7 +54,7 @@ Rails.application.configure do
     end
 
   config.active_storage.resolve_model_to_route = :rails_storage_proxy if ENV['ACTIVE_STORAGE_PUBLIC'] != 'true'
-  config.active_storage.service_urls_expire_in = 15.minutes
+  config.active_storage.service_urls_expire_in = 4.hours
 
   # Mount Action Cable outside main process or domain.
   # config.action_cable.mount_path = nil
@@ -136,13 +138,14 @@ Rails.application.configure do
         end
 
       {
-        fwd: controller.request.ip,
+        fwd: controller.request.remote_ip,
         params: {
           id: params[:id],
           sig: (params[:signed_uuid] || params[:signed_id]).to_s.split('--').first,
           slug: (params[:slug] ||
                  params[:submitter_slug] ||
                  params[:submission_slug] ||
+                 params[:submit_form_slug] ||
                  params[:template_slug]).to_s.last(5)
         }.compact_blank,
         host: controller.request.host,
@@ -154,7 +157,7 @@ Rails.application.configure do
 
     config.lograge.custom_payload do |controller|
       {
-        fwd: controller.request.ip
+        fwd: controller.request.remote_ip
       }
     end
   end

config/environments/test.rb

@@ -16,7 +16,7 @@ Rails.application.configure do
   # Eager loading loads your whole application. When running a single test locally,
   # this probably isn't necessary. It's a good idea to do in a continuous integration
   # system, or in some way before deploying your code.
-  config.eager_load = ENV['CI'].present?
+  config.eager_load = true
 
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true

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/initializers/hexapdf.rb

@@ -14,6 +14,13 @@ module HexaPDF
   end
 
   module Type
+    class Page
+      # fix NoMethodError (undefined method `color_space' for an instance of HexaPDF::Type::Page)
+      def color_space(name)
+        GlobalConfiguration.constantize('color_space.map', name).new
+      end
+    end
+
     # fix NoMethodError: undefined method `field_value' for #<HexaPDF::Type::AcroForm::Field
     module AcroForm
       class Field

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

config/routes.rb

@@ -50,11 +50,13 @@ Rails.application.routes.draw do
   resources :enquiries, only: %i[create]
   resources :users, only: %i[new create edit update destroy]
   resource :user_signature, only: %i[edit update destroy]
+  resource :user_initials, only: %i[edit update destroy]
   resources :submissions_archived, only: %i[index], path: 'submissions/archived'
   resources :submissions, only: %i[index], controller: 'submissions_dashboard'
   resources :submissions, only: %i[show destroy]
   resources :console_redirect, only: %i[index]
   resources :upgrade, only: %i[index], controller: 'console_redirect'
+  resources :manage, only: %i[index], controller: 'console_redirect'
   resource :testing_account, only: %i[show destroy]
   resources :testing_api_settings, only: %i[index]
   resources :submitters_autocomplete, only: %i[index]
@@ -104,9 +106,12 @@ Rails.application.routes.draw do
   end
 
   resources :submit_form, only: %i[show update], path: 's', param: 'slug' do
+    resources :values, only: %i[index], controller: 'submit_form_values'
     get :completed
   end
 
+  resources :submit_form_draw_signature, only: %i[show], path: 'p', param: 'slug'
+
   resources :submissions_preview, only: %i[show], path: 'e', param: 'slug' do
     get :completed
   end