fix erblint

.gitignore

@@ -36,3 +36,4 @@ yarn-debug.log*
 /attachments
 /docuseal
 /ee
+dump.rdb

.rubocop.yml

@@ -76,5 +76,8 @@ Rails/SkipsModelValidations:
 Rails/ApplicationController:
   Enabled: false
 
+Rails/Output:
+  Enabled: false
+
 Capybara/ClickLinkOrButtonStyle:
   Enabled: false

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.3.1-alpine3.18 as fonts
+FROM ruby:3.3.1-alpine as fonts
 
 WORKDIR /fonts
 
@@ -6,7 +6,7 @@ RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-
 
 RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'
 
-FROM ruby:3.3.1-alpine3.18 as webpack
+FROM ruby:3.3.1-alpine as webpack
 
 ENV RAILS_ENV=production
 ENV NODE_ENV=production
@@ -32,7 +32,7 @@ COPY ./app/views ./app/views
 
 RUN echo "gem 'shakapacker'" > Gemfile && ./bin/shakapacker
 
-FROM ruby:3.3.1-alpine3.18 as app
+FROM ruby:3.3.1-alpine as app
 
 ENV RAILS_ENV=production
 ENV BUNDLE_WITHOUT="development:test"
@@ -41,7 +41,7 @@ ENV OPENSSL_CONF=/app/openssl_legacy.cnf
 
 WORKDIR /app
 
-RUN apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils vips-heif gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
+RUN apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils redis vips-heif gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
 
 RUN echo $'.include = /etc/ssl/openssl.cnf\n\
 \n\

Gemfile

@@ -27,7 +27,7 @@ gem 'pagy'
 gem 'pg', require: false
 gem 'premailer-rails'
 gem 'pretender'
-gem 'puma'
+gem 'puma', require: false
 gem 'rack'
 gem 'rails'
 gem 'rails_autolink'
@@ -37,7 +37,7 @@ gem 'rqrcode'
 gem 'ruby-vips'
 gem 'rubyXL'
 gem 'shakapacker'
-gem 'sidekiq', require: ENV.key?('REDIS_URL')
+gem 'sidekiq'
 gem 'sqlite3', require: false, force_ruby_platform: true
 gem 'strip_attributes'
 gem 'turbo-rails'

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

@@ -64,14 +64,14 @@ module Api
       submissions = create_submissions(@template, params)
 
       submissions.each do |submission|
-        SendSubmissionCreatedWebhookRequestJob.perform_later(submission)
+        SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => submission.id })
       end
 
       Submissions.send_signature_requests(submissions)
 
       submissions.each do |submission|
         if submission.submitters.all?(&:completed_at?) && submission.submitters.last
-          ProcessSubmitterCompletionJob.perform_later(submission.submitters.last)
+          ProcessSubmitterCompletionJob.perform_async({ 'submitter_id' => submission.submitters.last.id })
         end
       end
 
@@ -89,11 +89,15 @@ module Api
     end
 
     def destroy
-      @submission.update!(archived_at: Time.current)
+      if params[:permanently] == 'true'
+        @submission.destroy!
+      else
+        @submission.update!(archived_at: Time.current)
 
-      SendSubmissionArchivedWebhookRequestJob.perform_later(@submission)
+        SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)
+      end
 
-      render json: @submission.as_json(only: %i[id], methods: %i[archived_at])
+      render json: @submission.as_json(only: %i[id archived_at])
     end
 
     private

app/controllers/api/submitter_form_views_controller.rb

@@ -13,7 +13,7 @@ module Api
 
       SubmissionEvents.create_with_tracking_data(submitter, 'view_form', request)
 
-      SendFormViewedWebhookRequestJob.perform_later(submitter)
+      SendFormViewedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id })
 
       render json: {}
     end

app/controllers/api/submitters_controller.rb

@@ -66,7 +66,7 @@ module Api
       end
 
       if @submitter.completed_at?
-        ProcessSubmitterCompletionJob.perform_later(@submitter)
+        ProcessSubmitterCompletionJob.perform_async({ 'submitter_id' => @submitter.id })
       elsif normalized_params[:send_email] || normalized_params[:send_sms]
         Submitters.send_signature_requests([@submitter])
       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/api/templates_clone_controller.rb

@@ -20,7 +20,7 @@ module Api
 
       Templates::CloneAttachments.call(template: cloned_template, original_template: @template)
 
-      SendTemplateCreatedWebhookRequestJob.perform_later(cloned_template)
+      SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => cloned_template.id)
 
       render json: Templates::SerializeForApi.call(cloned_template)
     end

app/controllers/api/templates_controller.rb

@@ -65,13 +65,13 @@ module Api
 
       @template.update!(template_params)
 
-      SendTemplateUpdatedWebhookRequestJob.perform_later(@template)
+      SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)
 
       render json: @template.as_json(only: %i[id updated_at])
     end
 
     def destroy
-      if params[:permanently] == 'true' && !Docuseal.multitenant?
+      if params[:permanently] == 'true'
         @template.destroy!
       else
         @template.update!(archived_at: Time.current)

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

@@ -36,7 +36,9 @@ class StartFormController < ApplicationController
       is_new_record = @submitter.new_record?
 
       if @submitter.save
-        SendSubmissionCreatedWebhookRequestJob.perform_later(@submitter.submission) if is_new_record
+        if is_new_record
+          SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => @submitter.submission.id })
+        end
 
         redirect_to submit_form_path(@submitter.slug)
       else

app/controllers/submissions_controller.rb

@@ -45,7 +45,7 @@ class SubmissionsController < ApplicationController
       end
 
     submissions.each do |submission|
-      SendSubmissionCreatedWebhookRequestJob.perform_later(submission)
+      SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => submission.id })
     end
 
     Submissions.send_signature_requests(submissions)
@@ -56,7 +56,7 @@ class SubmissionsController < ApplicationController
   def destroy
     @submission.update!(archived_at: Time.current)
 
-    SendSubmissionArchivedWebhookRequestJob.perform_later(@submission)
+    SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)
 
     redirect_back(fallback_location: template_path(@submission.template), notice: 'Submission has been archived')
   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/submitters_send_email_controller.rb

@@ -13,7 +13,7 @@ class SubmittersSendEmailController < ApplicationController
                            alert: 'Email has been sent already.')
     end
 
-    SendSubmitterInvitationEmailJob.perform_later('submitter_id' => @submitter.id)
+    SendSubmitterInvitationEmailJob.perform_async('submitter_id' => @submitter.id)
 
     @submitter.sent_at ||= Time.current
     @submitter.save!

app/controllers/template_documents_controller.rb

@@ -10,7 +10,7 @@ class TemplateDocumentsController < ApplicationController
 
     old_fields_hash = @template.fields.hash
 
-    documents = Templates::CreateAttachments.call(@template, params)
+    documents = Templates::CreateAttachments.call(@template, params, extract_fields: true)
 
     schema = documents.map do |doc|
       { attachment_uuid: doc.uuid, name: doc.filename.base }

app/controllers/templates_controller.rb

@@ -53,7 +53,7 @@ class TemplatesController < ApplicationController
 
     if params[:account_id].present? && authorized_clone_account_id?(params[:account_id])
       @template.account_id = params[:account_id]
-      @template.folder = @template.account.default_template_folder
+      @template.folder = @template.account.default_template_folder if @template.account_id != current_account.id
     else
       @template.account = current_account
     end
@@ -61,7 +61,7 @@ class TemplatesController < ApplicationController
     if @template.save
       Templates::CloneAttachments.call(template: @template, original_template: @base_template) if @base_template
 
-      SendTemplateUpdatedWebhookRequestJob.perform_later(@template)
+      SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)
 
       maybe_redirect_to_template(@template)
     else
@@ -72,7 +72,7 @@ class TemplatesController < ApplicationController
   def update
     @template.update!(template_params)
 
-    SendTemplateUpdatedWebhookRequestJob.perform_later(@template)
+    SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)
 
     head :ok
   end

app/controllers/templates_debug_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class TemplatesDebugController < ApplicationController
+  load_and_authorize_resource :template
+
+  def show
+    attachment = @template.documents.first
+
+    pdf = HexaPDF::Document.new(io: StringIO.new(attachment.download))
+
+    fields = Templates::FindAcroFields.call(pdf, attachment)
+
+    attachment.metadata['pdf'] ||= {}
+    attachment.metadata['pdf']['fields'] = fields
+
+    @template.update!(fields: Templates::ProcessDocument.normalize_attachment_fields(@template, [attachment]))
+
+    ActiveRecord::Associations::Preloader.new(
+      records: [@template],
+      associations: [schema_documents: { preview_images_attachments: :blob }]
+    ).call
+
+    @template_data =
+      @template.as_json.merge(
+        documents: @template.schema_documents.as_json(
+          methods: %i[metadata signed_uuid],
+          include: { preview_images: { methods: %i[url metadata filename] } }
+        )
+      ).to_json
+
+    render 'templates/edit', layout: 'plain'
+  end
+end

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,18 @@ 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 documents_copy_email_attach_audit
+                      completed_notification_email_subject completed_notification_email_body
+                      completed_notification_email_enabled completed_notification_email_attach_audit]
+    ).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

@@ -12,13 +12,16 @@ class TemplatesUploadsController < ApplicationController
 
     save_template!(@template, url_params)
 
-    documents = Templates::CreateAttachments.call(@template, url_params || params)
-
+    documents = Templates::CreateAttachments.call(@template, url_params || params, extract_fields: true)
     schema = documents.map { |doc| { attachment_uuid: doc.uuid, name: doc.filename.base } }
 
-    @template.update!(schema:)
+    fields = Templates::ProcessDocument.normalize_attachment_fields(@template, documents)
 
-    SendTemplateCreatedWebhookRequestJob.perform_later(@template)
+    schema.each { |item| item['pending_fields'] = true } if fields.present?
+
+    @template.update!(schema:, fields:)
+
+    SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => @template.id)
 
     redirect_to edit_template_path(@template)
   rescue Templates::CreateAttachments::PdfEncrypted

app/controllers/users_controller.rb

@@ -47,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/controllers/webhook_settings_controller.rb

@@ -17,7 +17,7 @@ class WebhookSettingsController < ApplicationController
   def update
     submitter = current_account.submitters.where.not(completed_at: nil).order(:id).last
 
-    SendFormCompletedWebhookRequestJob.perform_later(submitter)
+    SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id })
 
     redirect_back(fallback_location: settings_webhooks_path, notice: 'Webhook request has been sent.')
   end

app/javascript/draw.js

@@ -70,6 +70,7 @@ window.customElements.define('draw-signature', class extends HTMLElement {
         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',

app/javascript/elements/signature_form.js

@@ -5,8 +5,12 @@ export default targetable(class extends HTMLElement {
   static [target.static] = ['canvas', 'input', 'clear', 'button']
 
   async connectedCallback () {
-    this.canvas.width = this.canvas.parentNode.parentNode.clientWidth
-    this.canvas.height = this.canvas.parentNode.parentNode.clientWidth / 3
+    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)
 
     const { default: SignaturePad } = await import('signature_pad')
 

app/javascript/form.js

@@ -15,6 +15,7 @@ safeRegisterElement('submission-form', class extends HTMLElement {
     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',
@@ -22,6 +23,7 @@ safeRegisterElement('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,

app/javascript/submission_form/area.vue

@@ -340,12 +340,18 @@ export default {
     computedStyle () {
       const { x, y, w, h } = this.area
 
-      return {
+      const style = {
         top: y * 100 + '%',
         left: x * 100 + '%',
         width: w * 100 + '%',
         height: h * 100 + '%'
       }
+
+      if (this.field.preferences?.font_size) {
+        style.fontSize = this.field.preferences.font_size + 'pt'
+      }
+
+      return style
     }
   },
   watch: {

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,13 +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"
             :with-qr-button="withQrButton"
-            :submitter-slug="submitterSlug"
+            :submitter="submitter"
             :show-field-names="showFieldNames"
             @attached="attachments.push($event)"
             @start="scrollIntoField(currentField)"
@@ -549,6 +550,11 @@ export default {
       required: false,
       default: null
     },
+    rememberSignature: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     minimize: {
       type: Boolean,
       required: false,
@@ -609,6 +615,11 @@ export default {
       required: false,
       default: ''
     },
+    previousSignatureValue: {
+      type: String,
+      required: false,
+      default: ''
+    },
     allowToSkip: {
       type: Boolean,
       required: false,
@@ -686,6 +697,7 @@ export default {
       isFormVisible: this.expand !== false,
       showFillAllRequiredFields: false,
       currentStep: 0,
+      enableScrollIntoField: true,
       phoneVerifiedValues: {},
       orientation: screen?.orientation?.type,
       isSubmitting: false,
@@ -981,10 +993,12 @@ export default {
         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.enableScrollIntoField = false
+          this.$refs.form.querySelector('input[type="date"], input[type="number"], input[type="text"], select')?.focus()
+          this.enableScrollIntoField = true
+
           if (clickUpload && !this.values[this.currentField.uuid] && ['file', 'image'].includes(this.currentField.type)) {
             this.$refs.form.querySelector('input[type="file"]')?.click()
           }
@@ -1017,7 +1031,9 @@ export default {
       }
     },
     scrollIntoField (field) {
-      return this.$refs.areas.scrollIntoField(field)
+      if (this.enableScrollIntoField) {
+        return this.$refs.areas.scrollIntoField(field)
+      }
     },
     scrollIntoArea (area) {
       return this.$refs.areas.scrollIntoArea(area)

app/javascript/submission_form/i18n.js

@@ -11,6 +11,7 @@ const en = {
   number: 'Number',
   image: 'Image',
   take_photo: 'Take photo',
+  number_phone_is_invalid: '{number} phone is invalid',
   file: 'File',
   select: 'Select',
   checkbox: 'Checkbox',
@@ -85,6 +86,7 @@ const es = {
   file: 'Archivo',
   select: 'Seleccionar',
   checkbox: 'Casilla',
+  number_phone_is_invalid: '{number} teléfono es inválido',
   multiple: 'Múltiple',
   radio: 'Radio',
   cells: 'Celdas',
@@ -160,6 +162,7 @@ const it = {
   cells: 'Celle',
   stamp: 'Timbro',
   payment: 'Pagamento',
+  number_phone_is_invalid: '{number} telefono non è valido',
   phone: 'Telefono',
   submit_form: 'Invia Modulo',
   sign_now: 'Firma ora',
@@ -230,6 +233,7 @@ const de = {
   cells: 'Zellen',
   stamp: 'Stempel',
   payment: 'Zahlung',
+  number_phone_is_invalid: '{number} Telefonnummer ist ungültig',
   phone: 'Telefon',
   submit_form: 'Formular absenden',
   sign_now: 'Jetzt unterschreiben',
@@ -300,6 +304,7 @@ const fr = {
   cells: 'Cellules',
   stamp: 'Tampon',
   payment: 'Paiement',
+  number_phone_is_invalid: '{number} téléphone est invalide',
   phone: 'Téléphone',
   submit_form: 'Envoyer le Formulaire',
   sign_now: 'Signer maintenant',
@@ -370,6 +375,7 @@ const pl = {
   cells: 'Komórki',
   stamp: 'Pieczątka',
   payment: 'Płatność',
+  number_phone_is_invalid: '{number} telefon jest nieprawidłowy',
   phone: 'Telefon',
   submit_form: 'Wyślij Formularz',
   sign_now: 'Podpisz teraz',
@@ -440,6 +446,7 @@ const uk = {
   cells: 'Клітинки',
   stamp: 'Штамп',
   payment: 'Платіж',
+  number_phone_is_invalid: '{number} телефон недійсний',
   phone: 'Телефон',
   submit_form: 'Надіслати Форму',
   sign_now: 'Підписати зараз',
@@ -511,6 +518,7 @@ const cs = {
   stamp: 'Razítko',
   payment: 'Platba',
   phone: 'Telefon',
+  number_phone_is_invalid: '{number} telefon je neplatný',
   submit_form: 'Odeslat formulář',
   sign_now: 'Podepsat nyní',
   type_here_: 'Zadejte zde',
@@ -580,6 +588,7 @@ const pt = {
   cells: 'Células',
   stamp: 'Carimbo',
   payment: 'Pagamento',
+  number_phone_is_invalid: '{number} telefone é inválido',
   phone: 'Telefone',
   submit_form: 'Enviar Formulário',
   sign_now: 'Assinar agora',
@@ -651,6 +660,7 @@ const he = {
   stamp: 'חותמת',
   payment: 'תשלום',
   phone: 'טלפון',
+  number_phone_is_invalid: '{number} טלפון אינו חוקי',
   submit_form: 'שלח טופס',
   sign_now: 'חתום כעת',
   type_here_: 'הקלד כאן',
@@ -723,6 +733,7 @@ const nl = {
   stamp: 'Stempel',
   payment: 'Betaling',
   phone: 'Telefoon',
+  number_phone_is_invalid: '{number} telefoon is ongeldig',
   submit_form: 'Formulier verzenden',
   sign_now: 'Nu ondertekenen',
   type_here_: 'Typ hier...',
@@ -794,6 +805,7 @@ const ar = {
   minimize: 'تصغير',
   payment: 'الدفع',
   phone: 'هاتف',
+  number_phone_is_invalid: '{number} هاتف غير صالح',
   submit_form: 'إرسال النموذج',
   sign_now: 'وقع الآن',
   type_here_: 'اكتب هنا',
@@ -865,6 +877,7 @@ const ko = {
   minimize: '최소화',
   payment: '결제',
   phone: '전화',
+  number_phone_is_invalid: '{number} 전화번호가 유효하지 않습니다',
   submit_form: '양식 제출',
   sign_now: '지금 서명',
   type_here_: '여기에 입력...',

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/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
@@ -172,6 +174,14 @@ export default {
           phone: this.$refs.phone.value
         }),
         headers: { 'Content-Type': 'application/json' }
+      }).then(async (resp) => {
+        if (resp.status === 422) {
+          const data = await resp.json()
+
+          alert(this.t('number_phone_is_invalid').replace('{number}', this.$refs.phone.value))
+
+          return Promise.reject(new Error(data.error))
+        }
       })
     },
     async submit () {
@@ -184,13 +194,13 @@ export default {
 
         return Promise.reject(new Error('phone invalid'))
       } else if (!this.isCodeSent) {
-        this.sendVerificationCode()
+        return this.sendVerificationCode().then(() => {
+          this.$emit('update:model-value', this.$refs.phone.value)
 
-        this.$emit('update:model-value', this.$refs.phone.value)
+          this.isCodeSent = true
 
-        this.isCodeSent = true
-
-        return Promise.reject(new Error('verify with code'))
+          return Promise.reject(new Error('verify with code'))
+        })
       } else {
         return Promise.resolve({})
       }

app/javascript/submission_form/signature_step.vue

@@ -54,7 +54,7 @@
           </a>
         </span>
         <span
-          v-if="field.preferences?.format !== 'typed'"
+          v-if="field.preferences?.format !== 'typed' && field.preferences?.format !== 'drawn'"
           class="tooltip"
           :data-tip="t('take_photo')"
         >
@@ -129,7 +129,7 @@
     <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"
     >
     <div class="relative">
       <div
@@ -255,8 +255,8 @@ export default {
       type: Object,
       required: true
     },
-    submitterSlug: {
-      type: String,
+    submitter: {
+      type: Object,
       required: true
     },
     showFieldNames: {
@@ -284,6 +284,11 @@ export default {
       required: false,
       default: true
     },
+    rememberSignature: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     attachmentsIndex: {
       type: Object,
       required: false,
@@ -311,6 +316,9 @@ export default {
     }
   },
   computed: {
+    submitterSlug () {
+      return this.submitter.slug
+    },
     computedPreviousValue () {
       if (this.isUsePreviousValue) {
         return this.previousValue
@@ -521,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) {
@@ -539,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',
@@ -547,10 +577,16 @@ export default {
             this.$emit('attached', attachment)
             this.$emit('update:model-value', attachment.uuid)
 
+            this.maybeSetSignedUuid(attachment.signed_uuid)
+
             return resolve(attachment)
           })
         }).catch((error) => {
-          return reject(error)
+          if (error.message === 'Image too small' && this.field.required === false) {
+            return resolve({})
+          } else {
+            return reject(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,21 +159,21 @@
     <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"
         class="flex justify-center items-center space-x-1 h-full"
-        :class="{'w-full h-full': field.type == 'checkbox'}"
+        :class="{ 'w-full h-full': ['cells', 'checkbox'].includes(field.type) }"
       >
         <div
-          v-if="field?.default_value"
-          :class="{ 'w-full h-full': field.type == 'checkbox', 'text-[1.5vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars }"
+          v-if="isDefaultValuePresent || isContenteditable"
+          :class="{ 'w-full h-full': ['cells', 'checkbox'].includes(field.type), 'text-[1.5vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars }"
         >
           <div
             ref="textContainer"
             class="flex items-center px-0.5"
-            :class="{'w-full h-full': field.type == 'checkbox'}"
+            :class="{ 'w-full h-full': ['cells', 'checkbox'].includes(field.type) }"
           >
             <IconCheck
               v-if="field.type == 'checkbox'"
@@ -162,12 +181,37 @@
               :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-if="field.default_value === '{{date}}'"
+            >
+              {{ t('signing_date') }}
+            </span>
+            <div
+              v-else-if="field.type === 'cells' && field.default_value"
+              class="w-full flex items-center"
+            >
+              <div
+                v-for="(char, index) in field.default_value"
+                :key="index"
+                class="text-center flex-none"
+                :style="{ width: (area.cell_w / area.w * 100) + '%' }"
+              >
+                {{ char }}
+              </div>
+            </div>
             <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 +225,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="maybeToggleDefaultValue"
     />
     <span
       v-if="field?.type && editable"
@@ -286,6 +333,7 @@ export default {
     return {
       isShowFormulaModal: false,
       isShowConditionsModal: false,
+      isContenteditable: false,
       isSettingsFocus: false,
       isShowDescriptionModal: false,
       isResize: false,
@@ -299,6 +347,13 @@ export default {
   computed: {
     fieldNames: FieldType.computed.fieldNames,
     fieldIcons: FieldType.computed.fieldIcons,
+    isDefaultValuePresent () {
+      if (this.field?.type === 'radio' && this.field?.areas?.length > 1) {
+        return false
+      } else {
+        return this.field?.default_value || this.field?.default_value === 0
+      }
+    },
     modalContainerEl () {
       return this.$el.getRootNode().querySelector('#docuseal_modal_container')
     },
@@ -364,26 +419,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 +476,32 @@ export default {
     closeDropdown () {
       document.activeElement.blur()
     },
+    maybeToggleDefaultValue () {
+      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
+            )
+          }
+        })
+      } else if (this.field.type === 'checkbox') {
+        this.field.readonly = !this.field.readonly
+        this.field.default_value === true ? delete this.field.default_value : this.field.default_value = true
+
+        this.save()
+      } else if (this.field.type === 'date') {
+        this.field.readonly = !this.field.readonly
+        this.field.default_value === '{{date}}' ? delete this.field.default_value : this.field.default_value = '{{date}}'
+
+        this.save()
+      }
+    },
     formatNumber (number, format) {
       if (format === 'comma') {
         return new Intl.NumberFormat('en-US').format(number)
@@ -463,6 +544,17 @@ export default {
 
       this.save()
     },
+    onPaste (e) {
+      const text = (e.clipboardData || window.clipboardData).getData('text/plain')
+
+      const selection = window.getSelection()
+
+      if (selection.rangeCount) {
+        selection.deleteFromDocument()
+        selection.getRangeAt(0).insertNode(document.createTextNode(text))
+        selection.collapseToEnd()
+      }
+    },
     onResizeCell (e) {
       if (e.target.id === 'mask') {
         const positionX = e.offsetX / (e.target.clientWidth - 1)
@@ -510,6 +602,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 +672,7 @@ export default {
         return
       }
 
-      this.$refs?.name?.blur()
+      document.activeElement?.blur()
 
       e.preventDefault()
 
@@ -569,8 +693,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 +708,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

@@ -3,6 +3,31 @@
     style="max-width: 1600px"
     class="mx-auto pl-3 md:pl-4 h-full"
   >
+    <div
+      v-if="pendingFieldAttachmentUuids.length"
+      class="top-1.5 sticky h-0 z-20 max-w-2xl mx-auto"
+    >
+      <div class="alert border-base-content/30 py-2 px-2.5">
+        <IconInfoCircle
+          class="stroke-info shrink-0 w-6 h-6"
+        />
+        <span>{{ t('uploaded_pdf_contains_form_fields_keep_or_remove_them') }}</span>
+        <div>
+          <button
+            class="btn btn-sm"
+            @click.prevent="removePendingFields"
+          >
+            {{ t('remove') }}
+          </button>
+          <button
+            class="btn btn-sm btn-neutral text-white"
+            @click.prevent="save"
+          >
+            {{ t('keep') }}
+          </button>
+        </div>
+      </div>
+    </div>
     <div
       v-if="$slots.buttons || withTitle"
       id="title_container"
@@ -296,7 +321,7 @@ import Contenteditable from './contenteditable'
 import DocumentPreview from './preview'
 import DocumentControls from './controls'
 import MobileFields from './mobile_fields'
-import { IconUsersPlus, IconDeviceFloppy, IconWritingSign, IconInnerShadowTop } from '@tabler/icons-vue'
+import { IconUsersPlus, IconDeviceFloppy, IconWritingSign, IconInnerShadowTop, IconInfoCircle } from '@tabler/icons-vue'
 import { v4 } from 'uuid'
 import { ref, computed } from 'vue'
 import { en as i18nEn } from './i18n'
@@ -307,6 +332,7 @@ export default {
     Upload,
     Document,
     Fields,
+    IconInfoCircle,
     MobileDrawField,
     IconWritingSign,
     MobileFields,
@@ -512,7 +538,9 @@ export default {
       isSaving: false,
       selectedSubmitter: null,
       showDrawField: false,
+      pendingFieldAttachmentUuids: [],
       drawField: null,
+      copiedArea: null,
       drawFieldType: null,
       drawOption: null,
       dragField: null
@@ -593,6 +621,12 @@ export default {
         document.querySelector('form[action="/auth/stripe_connect"]')?.closest('.dropdown')?.querySelector('label')?.focus()
       }
     })
+
+    this.template.schema.forEach((item) => {
+      if (item.pending_fields) {
+        this.pendingFieldAttachmentUuids.push(item.attachment_uuid)
+      }
+    })
   },
   unmounted () {
     document.removeEventListener('keyup', this.onKeyUp)
@@ -607,6 +641,13 @@ export default {
     t (key) {
       return this.i18n[key] || i18nEn[key] || key
     },
+    removePendingFields () {
+      this.template.fields = this.template.fields.filter((f) => {
+        return this.template.schema.find((item) => item.attachment_uuid === f.attachment_uuid && item.pending_fields)
+      })
+
+      this.save()
+    },
     addField (type, area = null) {
       const field = {
         name: '',
@@ -627,7 +668,7 @@ export default {
 
       if (type === 'date') {
         field.preferences = {
-          format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+          format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
         }
       }
 
@@ -660,7 +701,7 @@ export default {
 
         if (type === 'date') {
           field.preferences = {
-            format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+            format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
           }
         }
 
@@ -747,6 +788,14 @@ export default {
         event.preventDefault()
 
         this.undo()
+      } else if ((event.ctrlKey || event.metaKey) && event.key === 'c' && document.activeElement === document.body) {
+        event.preventDefault()
+
+        this.copiedArea = this.selectedAreaRef?.value
+      } else if ((event.ctrlKey || event.metaKey) && event.key === 'v' && this.copiedArea && document.activeElement === document.body) {
+        event.preventDefault()
+
+        this.pasteField()
       }
     },
     removeArea (area) {
@@ -760,6 +809,39 @@ export default {
 
       this.save()
     },
+    pasteField () {
+      const field = this.template.fields.find((f) => f.areas?.includes(this.copiedArea))
+      const currentArea = this.selectedAreaRef?.value || this.copiedArea
+
+      if (field && currentArea) {
+        const area = {
+          ...JSON.parse(JSON.stringify(this.copiedArea)),
+          attachment_uuid: currentArea.attachment_uuid,
+          page: currentArea.page,
+          x: currentArea.x,
+          y: currentArea.y + currentArea.h * 1.3
+        }
+
+        if (['radio', 'multiple'].includes(field.type)) {
+          this.copiedArea.option_uuid ||= field.options[0].uuid
+          area.option_uuid = v4()
+
+          field.options.push({ uuid: area.option_uuid })
+
+          field.areas.push(area)
+        } else {
+          this.template.fields.push({
+            ...JSON.parse(JSON.stringify(field)),
+            uuid: v4(),
+            areas: [area]
+          })
+        }
+
+        this.selectedAreaRef.value = area
+
+        this.save()
+      }
+    },
     pushUndo () {
       const stringData = JSON.stringify(this.template)
 
@@ -914,7 +996,7 @@ export default {
 
         if (field.type === 'date') {
           field.preferences = {
-            format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+            format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
           }
         }
       }
@@ -990,6 +1072,8 @@ export default {
       }
 
       this.save()
+
+      document.activeElement?.blur()
     },
     updateFromUpload (data) {
       this.template.schema.push(...data.schema)
@@ -1022,6 +1106,18 @@ export default {
       }
 
       this.save()
+
+      data.documents.forEach((attachment) => {
+        if (attachment.metadata?.pdf?.fields?.length) {
+          this.pendingFieldAttachmentUuids.push(attachment.uuid)
+
+          attachment.metadata.pdf.fields.forEach((field) => {
+            field.submitter_uuid = this.selectedSubmitter.uuid
+
+            this.template.fields.push(field)
+          })
+        }
+      })
     },
     updateName (value) {
       this.template.name = value
@@ -1136,7 +1232,7 @@ export default {
         if (submitterWithoutFields) {
           e.preventDefault()
 
-          alert(`Please add fields for ${submitterWithoutFields.name} to prepare the document or remove the party.`)
+          alert(`Please add fields for the ${submitterWithoutFields.name}. Or, remove the ${submitterWithoutFields.name} if not needed.`)
         }
       }
     },
@@ -1158,7 +1254,7 @@ export default {
           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.`)
+          alert(`Please add fields for the ${submitterWithoutFields.name}. Or, remove the ${submitterWithoutFields.name} if not needed.`)
         } else {
           this.isSaving = true
 
@@ -1188,6 +1284,8 @@ export default {
       })
     },
     save ({ force } = { force: false }) {
+      this.pendingFieldAttachmentUuids = []
+
       if (this.onChange) {
         this.onChange(this.template)
       }

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,17 @@ export default {
     }
   },
   methods: {
+    onPaste (e) {
+      const text = (e.clipboardData || window.clipboardData).getData('text/plain')
+
+      const selection = window.getSelection()
+
+      if (selection.rangeCount) {
+        selection.deleteFromDocument()
+        selection.getRangeAt(0).insertNode(document.createTextNode(text))
+        selection.collapseToEnd()
+      }
+    },
     selectContent () {
       const el = this.$refs.contenteditable
 

app/javascript/template_builder/field.vue

@@ -339,7 +339,7 @@ export default {
 
     if (this.field.type === 'date') {
       this.field.preferences.format ||=
-        (Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY')
+        (Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY')
     }
   },
   methods: {

app/javascript/template_builder/field_settings.vue

@@ -52,6 +52,40 @@
       {{ t('align') }}
     </label>
   </div>
+  <div
+    v-if="['select', 'radio'].includes(field.type) && !defaultField"
+    class="py-1.5 px-1 relative"
+    @click.stop
+  >
+    <select
+      :placeholder="t('default_value')"
+      dir="auto"
+      class="select select-bordered select-xs w-full max-w-xs h-7 !outline-0 font-normal bg-transparent"
+      @change="[field.default_value = $event.target.value, !field.default_value && delete field.default_value, save()]"
+    >
+      <option
+        value=""
+        :selected="!field.default_value"
+      >
+        {{ t('none') }}
+      </option>
+      <option
+        v-for="(option, index) in field.options || []"
+        :key="option.uuid"
+        :value="option.value || `${t('option')} ${index + 1}`"
+        :selected="field.default_value === (option.value || `${t('option')} ${index + 1}`)"
+      >
+        {{ option.value || `${t('option')} ${index + 1}` }}
+      </option>
+    </select>
+    <label
+      :style="{ backgroundColor }"
+      class="absolute -top-1 left-2.5 px-1 h-4"
+      style="font-size: 8px"
+    >
+      {{ t('default_value') }}
+    </label>
+  </div>
   <div
     v-if="['text', 'number'].includes(field.type) && !defaultField"
     class="py-1.5 px-1 relative"
@@ -74,6 +108,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 +487,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 +505,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,21 @@
 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',
+  uploaded_pdf_contains_form_fields_keep_or_remove_them: 'Uploaded PDF contains form fields. Keep or remove them?',
+  keep: 'Keep',
   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',
@@ -24,6 +29,7 @@ const en = {
   are_you_sure: 'Are you sure?',
   sign_yourself: 'Sign Yourself',
   set_signing_date: 'Set signing date',
+  signing_date: 'Signing Date',
   send: 'Send',
   remove: 'Remove',
   edit: 'Edit',
@@ -98,7 +104,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

@@ -204,7 +204,7 @@ export default {
       return document.location.origin + '/auth/stripe_connect/callback'
     },
     defaultCurrencies () {
-      return ['USD', 'EUR', 'GBP']
+      return ['USD', 'EUR', 'GBP', 'CAD', 'AUD']
     },
     currenciesList () {
       return this.currencies.length ? this.currencies : this.defaultCurrencies
@@ -226,6 +226,10 @@ export default {
         return 'EUR'
       } else if (userTimezone.includes('London') || userTimezone.includes('Belfast')) {
         return 'GBP'
+      } else if (userTimezone.includes('Vancouver') || userTimezone.includes('Toronto') || userTimezone.includes('Halifax') || userTimezone.includes('Edmonton')) {
+        return 'CAD'
+      } else if (userTimezone.startsWith('Australia')) {
+        return 'AUD'
       } else {
         return 'USD'
       }

app/jobs/application_job.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 class ApplicationJob < ActiveJob::Base
+  retry_on StandardError, wait: 6.seconds, attempts: 5 unless Docuseal.multitenant?
 end

app/jobs/process_submitter_completion_job.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
-class ProcessSubmitterCompletionJob < ApplicationJob
-  def perform(submitter)
+class ProcessSubmitterCompletionJob
+  include Sidekiq::Job
+
+  def perform(params = {})
+    submitter = Submitter.find(params['submitter_id'])
+
     is_all_completed = !submitter.submission.submitters.exists?(completed_at: nil)
 
     if !is_all_completed && submitter.submission.submitters_order_preserved?
@@ -18,7 +22,7 @@ class ProcessSubmitterCompletionJob < ApplicationJob
 
     return if Accounts.load_webhook_url(submitter.account).blank?
 
-    SendFormCompletedWebhookRequestJob.perform_later(submitter)
+    SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id })
   end
 
   def enqueue_completed_emails(submitter)
@@ -26,26 +30,33 @@ class ProcessSubmitterCompletionJob < ApplicationJob
 
     user = submission.created_by_user || submitter.template.author
 
-    if submitter.account.users.exists?(id: user.id) && submission.preferences['send_email'] != false
+    if submitter.account.users.exists?(id: user.id) && submission.preferences['send_email'] != false &&
+       submitter.template.preferences['completed_notification_email_enabled'] != false
       if submission.submitters.map(&:email).exclude?(user.email) &&
          user.user_configs.find_by(key: UserConfig::RECEIVE_COMPLETED_EMAIL)&.value != false &&
          user.role != 'integration'
         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,14 +1,18 @@
 # frozen_string_literal: true
 
-class SendFormCompletedWebhookRequestJob < ApplicationJob
-  queue_as :webhooks
+class SendFormCompletedWebhookRequestJob
+  include Sidekiq::Job
+
+  sidekiq_options queue: :webhooks
 
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10
 
-  def perform(submitter, params = {})
-    attempt = params[:attempt].to_i
+  def perform(params = {})
+    submitter = Submitter.find(params['submitter_id'])
+
+    attempt = params['attempt'].to_i
     url = Accounts.load_webhook_url(submitter.submission.account)
 
     return if url.blank?
@@ -36,11 +40,11 @@ class SendFormCompletedWebhookRequestJob < ApplicationJob
 
     if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
        (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
-      SendFormCompletedWebhookRequestJob.set(wait: (2**attempt).minutes)
-                                        .perform_later(submitter, {
-                                                         attempt: attempt + 1,
-                                                         last_status: resp&.status.to_i
-                                                       })
+      SendFormCompletedWebhookRequestJob.perform_in((2**attempt).minutes, {
+                                                      'submitter_id' => submitter.id,
+                                                      'attempt' => attempt + 1,
+                                                      'last_status' => resp&.status.to_i
+                                                    })
     end
   end
 end

app/jobs/send_form_started_webhook_request_job.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
-class SendFormStartedWebhookRequestJob < ApplicationJob
-  queue_as :webhooks
+class SendFormStartedWebhookRequestJob
+  include Sidekiq::Job
+
+  sidekiq_options queue: :webhooks
 
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10
 
-  def perform(submitter, params = {})
-    attempt = params[:attempt].to_i
+  def perform(params = {})
+    submitter = Submitter.find(params['submitter_id'])
+
+    attempt = params['attempt'].to_i
     url = Accounts.load_webhook_url(submitter.submission.account)
 
     return if url.blank?
@@ -34,11 +38,11 @@ class SendFormStartedWebhookRequestJob < ApplicationJob
 
     if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
        (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
-      SendFormStartedWebhookRequestJob.set(wait: (2**attempt).minutes)
-                                      .perform_later(submitter, {
-                                                       attempt: attempt + 1,
-                                                       last_status: resp&.status.to_i
-                                                     })
+      SendFormStartedWebhookRequestJob.perform_in((2**attempt).minutes, {
+                                                    'submitter_id' => submitter.id,
+                                                    'attempt' => attempt + 1,
+                                                    'last_status' => resp&.status.to_i
+                                                  })
     end
   end
 end

app/jobs/send_form_viewed_webhook_request_job.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
-class SendFormViewedWebhookRequestJob < ApplicationJob
-  queue_as :webhooks
+class SendFormViewedWebhookRequestJob
+  include Sidekiq::Job
+
+  sidekiq_options queue: :webhooks
 
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10
 
-  def perform(submitter, params = {})
-    attempt = params[:attempt].to_i
+  def perform(params = {})
+    submitter = Submitter.find(params['submitter_id'])
+
+    attempt = params['attempt'].to_i
     url = Accounts.load_webhook_url(submitter.submission.account)
 
     return if url.blank?
@@ -34,11 +38,11 @@ class SendFormViewedWebhookRequestJob < ApplicationJob
 
     if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
        (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
-      SendFormViewedWebhookRequestJob.set(wait: (2**attempt).minutes)
-                                     .perform_later(submitter, {
-                                                      attempt: attempt + 1,
-                                                      last_status: resp&.status.to_i
-                                                    })
+      SendFormViewedWebhookRequestJob.perform_in((2**attempt).minutes, {
+                                                   'submitter_id' => submitter.id,
+                                                   'attempt' => attempt + 1,
+                                                   'last_status' => resp&.status.to_i
+                                                 })
     end
   end
 end

app/jobs/send_submission_archived_webhook_request_job.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
-class SendSubmissionArchivedWebhookRequestJob < ApplicationJob
-  queue_as :webhooks
+class SendSubmissionArchivedWebhookRequestJob
+  include Sidekiq::Job
+
+  sidekiq_options queue: :webhooks
 
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10
 
-  def perform(submission, params = {})
-    attempt = params[:attempt].to_i
+  def perform(params = {})
+    submission = Submission.find(params['submission_id'])
+
+    attempt = params['attempt'].to_i
     url = Accounts.load_webhook_url(submission.account)
 
     return if url.blank?
@@ -32,11 +36,11 @@ class SendSubmissionArchivedWebhookRequestJob < ApplicationJob
 
     if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
        (!Docuseal.multitenant? || submission.account.account_configs.exists?(key: :plan))
-      SendSubmissionArchivedWebhookRequestJob.set(wait: (2**attempt).minutes)
-                                             .perform_later(submission, {
-                                                              attempt: attempt + 1,
-                                                              last_status: resp&.status.to_i
-                                                            })
+      SendSubmissionArchivedWebhookRequestJob.perform_in((2**attempt).minutes, {
+                                                           'submission_id' => submission.id,
+                                                           'attempt' => attempt + 1,
+                                                           'last_status' => resp&.status.to_i
+                                                         })
     end
   end
 end

app/jobs/send_submission_created_webhook_request_job.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
-class SendSubmissionCreatedWebhookRequestJob < ApplicationJob
-  queue_as :webhooks
+class SendSubmissionCreatedWebhookRequestJob
+  include Sidekiq::Job
+
+  sidekiq_options queue: :webhooks
 
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10
 
-  def perform(submission, params = {})
-    attempt = params[:attempt].to_i
+  def perform(params = {})
+    submission = Submission.find(params['submission_id'])
+
+    attempt = params['attempt'].to_i
     url = Accounts.load_webhook_url(submission.account)
 
     return if url.blank?
@@ -32,11 +36,11 @@ class SendSubmissionCreatedWebhookRequestJob < ApplicationJob
 
     if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
        (!Docuseal.multitenant? || submission.account.account_configs.exists?(key: :plan))
-      SendSubmissionCreatedWebhookRequestJob.set(wait: (2**attempt).minutes)
-                                            .perform_later(submission, {
-                                                             attempt: attempt + 1,
-                                                             last_status: resp&.status.to_i
-                                                           })
+      SendSubmissionCreatedWebhookRequestJob.perform_in((2**attempt).minutes, {
+                                                          'submission_id' => submission.id,
+                                                          'attempt' => attempt + 1,
+                                                          'last_status' => resp&.status.to_i
+                                                        })
     end
   end
 end

app/jobs/send_submitter_invitation_email_job.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class SendSubmitterInvitationEmailJob < ApplicationJob
+class SendSubmitterInvitationEmailJob
+  include Sidekiq::Job
+
   def perform(params = {})
     submitter = Submitter.find(params['submitter_id'])
 

app/jobs/send_template_created_webhook_request_job.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
-class SendTemplateCreatedWebhookRequestJob < ApplicationJob
-  queue_as :webhooks
+class SendTemplateCreatedWebhookRequestJob
+  include Sidekiq::Job
+
+  sidekiq_options queue: :webhooks
 
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10
 
-  def perform(template, params = {})
-    attempt = params[:attempt].to_i
+  def perform(params = {})
+    template = Template.find(params['template_id'])
+
+    attempt = params['attempt'].to_i
     url = Accounts.load_webhook_url(template.account)
 
     return if url.blank?
@@ -32,11 +36,11 @@ class SendTemplateCreatedWebhookRequestJob < ApplicationJob
 
     if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
        (!Docuseal.multitenant? || template.account.account_configs.exists?(key: :plan))
-      SendTemplateCreatedWebhookRequestJob.set(wait: (2**attempt).minutes)
-                                          .perform_later(template, {
-                                                           attempt: attempt + 1,
-                                                           last_status: resp&.status.to_i
-                                                         })
+      SendTemplateCreatedWebhookRequestJob.perform_in((2**attempt).minutes, {
+                                                        'template_id' => template.id,
+                                                        'attempt' => attempt + 1,
+                                                        'last_status' => resp&.status.to_i
+                                                      })
     end
   end
 end

app/jobs/send_template_updated_webhook_request_job.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
-class SendTemplateUpdatedWebhookRequestJob < ApplicationJob
-  queue_as :webhooks
+class SendTemplateUpdatedWebhookRequestJob
+  include Sidekiq::Job
+
+  sidekiq_options queue: :webhooks
 
   USER_AGENT = 'DocuSeal.co Webhook'
 
   MAX_ATTEMPTS = 10
 
-  def perform(template, params = {})
-    attempt = params[:attempt].to_i
+  def perform(params = {})
+    template = Template.find(params['template_id'])
+
+    attempt = params['attempt'].to_i
     url = Accounts.load_webhook_url(template.account)
 
     return if url.blank?
@@ -32,11 +36,11 @@ class SendTemplateUpdatedWebhookRequestJob < ApplicationJob
 
     if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
        (!Docuseal.multitenant? || template.account.account_configs.exists?(key: :plan))
-      SendTemplateUpdatedWebhookRequestJob.set(wait: (2**attempt).minutes)
-                                          .perform_later(template, {
-                                                           attempt: attempt + 1,
-                                                           last_status: resp&.status.to_i
-                                                         })
+      SendTemplateUpdatedWebhookRequestJob.perform_in((2**attempt).minutes, {
+                                                        'template_id' => template.id,
+                                                        'attempt' => attempt + 1,
+                                                        'last_status' => resp&.status.to_i
+                                                      })
     end
   end
 end

app/mailers/submitter_mailer.rb

@@ -48,16 +48,21 @@ class SubmitterMailer < ApplicationMailer
     @email_config = AccountConfigs.find_for_account(@current_account, AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY)
 
     add_completed_email_attachments!(
-      submitter, with_audit_log: @email_config.nil? || @email_config.value['attach_audit_log'] != false
+      submitter, with_audit_log: (@email_config.nil? || @email_config.value['attach_audit_log'] != false) &&
+                                 @submitter.template.preferences['completed_notification_email_attach_audit'] != false
     )
 
+    @subject = @submitter.template.preferences['completed_notification_email_subject'].presence
+    @subject ||= @email_config.value['subject'] if @email_config
+
+    @body = @submitter.template.preferences['completed_notification_email_body'].presence
+    @body ||= @email_config.value['body'] if @email_config
+
     subject =
-      if @email_config
-        ReplaceEmailVariables.call(@email_config.value['subject'], submitter:)
+      if @subject.present?
+        ReplaceEmailVariables.call(@subject, submitter:)
       else
-        submitters = submitter.submission.submitters.order(:completed_at)
-                              .map { |e| e.name || e.email || e.phone }.join(', ')
-        %(#{submitter.submission.template.name} has been completed by #{submitters})
+        build_completed_subject(submitter)
       end
 
     assign_message_metadata('submitter_completed', @submitter)
@@ -77,7 +82,8 @@ class SubmitterMailer < ApplicationMailer
     @email_config = AccountConfigs.find_for_account(@current_account, AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY)
 
     @documents = add_completed_email_attachments!(
-      submitter, with_audit_log: @email_config.nil? || @email_config.value['attach_audit_log'] != false
+      submitter, with_audit_log: @submitter.template.preferences['documents_copy_email_attach_audit'] != false &&
+                                 (@email_config.nil? || @email_config.value['attach_audit_log'] != false)
     )
 
     @subject = @submitter.template.preferences['documents_copy_email_subject'].presence
@@ -105,6 +111,12 @@ class SubmitterMailer < ApplicationMailer
 
   private
 
+  def build_completed_subject(submitter)
+    submitters = submitter.submission.submitters.order(:completed_at)
+                          .map { |e| e.name || e.email || e.phone }.join(', ')
+    %(#{submitter.submission.template.name} has been completed by #{submitters})
+  end
+
   def add_completed_email_attachments!(submitter, with_audit_log: true)
     documents = Submitters.select_attachments_for_download(submitter)
 
@@ -119,7 +131,7 @@ class SubmitterMailer < ApplicationMailer
 
     total_size = add_attachments_with_size_limit(documents, total_size)
 
-    attachments[submitter.submission.audit_trail.filename.to_s] = audit_trail_data if audit_trail_data
+    attachments[submitter.submission.audit_trail.filename.to_s.tr('"', "'")] = audit_trail_data if audit_trail_data
 
     file_fields = submitter.submission.template_fields.select { |e| e['type'].in?(%w[file payment]) }
 
@@ -141,7 +153,7 @@ class SubmitterMailer < ApplicationMailer
 
       break if total_size >= MAX_ATTACHMENTS_SIZE
 
-      attachments[attachment.filename.to_s] = attachment.download
+      attachments[attachment.filename.to_s.tr('"', "'")] = attachment.download
     end
 
     total_size

app/mailers/user_mailer.rb

@@ -9,6 +9,6 @@ class UserMailer < ApplicationMailer
     assign_message_metadata('user_invitation', @user)
 
     mail(to: @user.friendly_name,
-         subject: 'You are invited to DocuSeal')
+         subject: "You are invited to #{Docuseal.product_name}")
   end
 end

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

@@ -26,6 +26,7 @@
 # Indexes
 #
 #  index_submitters_on_email          (email)
+#  index_submitters_on_external_id    (external_id)
 #  index_submitters_on_slug           (slug) UNIQUE
 #  index_submitters_on_submission_id  (submission_id)
 #

app/models/template.rb

@@ -22,10 +22,11 @@
 #
 # Indexes
 #
-#  index_templates_on_account_id  (account_id)
-#  index_templates_on_author_id   (author_id)
-#  index_templates_on_folder_id   (folder_id)
-#  index_templates_on_slug        (slug) UNIQUE
+#  index_templates_on_account_id   (account_id)
+#  index_templates_on_author_id    (author_id)
+#  index_templates_on_external_id  (external_id)
+#  index_templates_on_folder_id    (folder_id)
+#  index_templates_on_slug         (slug) UNIQUE
 #
 # Foreign Keys
 #

app/models/user.rb

@@ -81,6 +81,12 @@ class User < ApplicationRecord
     true
   end
 
+  def sidekiq?
+    return true if Rails.env.development?
+
+    role == 'admin'
+  end
+
   def self.sign_in_after_reset_password
     if PasswordsController::Current.user.present?
       !PasswordsController::Current.user.otp_required_for_login

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| %>

app/views/icons/_brand_openai.html.erb

@@ -0,0 +1,9 @@
+<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="M11.217 19.384a3.501 3.501 0 0 0 6.783 -1.217v-5.167l-6 -3.35" />
+  <path d="M5.214 15.014a3.501 3.501 0 0 0 4.446 5.266l4.34 -2.534v-6.946" />
+  <path d="M6 7.63c-1.391 -.236 -2.787 .395 -3.534 1.689a3.474 3.474 0 0 0 1.271 4.745l4.263 2.514l6 -3.348" />
+  <path d="M12.783 4.616a3.501 3.501 0 0 0 -6.783 1.217v5.067l6 3.45" />
+  <path d="M18.786 8.986a3.501 3.501 0 0 0 -4.446 -5.266l-4.34 2.534v6.946" />
+  <path d="M18 16.302c1.391 .236 2.787 -.395 3.534 -1.689a3.474 3.474 0 0 0 -1.271 -4.745l-4.308 -2.514l-5.955 3.42" />
+</svg>

app/views/notifications_settings/_bcc_form.html.erb

@@ -4,7 +4,7 @@
     <%= f.label :value, class: 'label' do %>
       <span class="flex items-center space-x-1">
         <span>
-          Completed documents BCC address
+          Completed documents notification BCC address
         </span>
         <span class="tooltip" data-tip="Send email copy with completed documents to a specified BCC address.">
           <%= svg_icon('info_circle', class: 'w-4 h-4') %>

app/views/personalization_settings/_submitter_completed_email_form.html.erb

@@ -2,7 +2,7 @@
   <input type="checkbox">
   <div class="collapse-title text-xl font-medium">
     <div>
-      Form Completed Email
+      Completed Notification Email
     </div>
   </div>
   <div class="collapse-content">

app/views/personalization_settings/show.html.erb

@@ -4,8 +4,8 @@
     <p class="text-4xl font-bold mb-4">Email Templates</p>
     <div class="space-y-4">
       <%= render 'signature_request_email_form' %>
-      <%= render 'submitter_completed_email_form' %>
       <%= render 'documents_copy_email_form' %>
+      <%= render 'submitter_completed_email_form' %>
     </div>
     <p class="text-4xl font-bold mb-4 mt-8">Company Logo</p>
     <%= render 'logo_form' %>

app/views/shared/_settings_nav.html.erb

@@ -86,6 +86,7 @@
             <%= link_to 'SSO', settings_sso_index_path, class: 'text-base hover:bg-base-300' %>
           </li>
         <% end %>
+        <%= render 'shared/settings_nav_extra2' %>
         <% if (can?(:manage, EncryptedConfig) && current_user == true_user) || (current_user != true_user && current_account.testing?) %>
           <li>
             <%= form_for '', url: testing_account_path, method: current_account.testing? ? :delete : :get, html: { class: 'flex w-full' } do |f| %>
@@ -117,11 +118,13 @@
             <%= svg_icon('brand_discord', class: 'w-8 h-8') %>
           </a>
         </div>
-        <div class="tooltip" data-tip="Twitter">
-          <a href="<%= Docuseal::TWITTER_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
-            <%= svg_icon('brand_twitter', class: 'w-8 h-8') %>
-          </a>
-        </div>
+        <%= content_for(:gpt_link) || capture do %>
+          <div class="tooltip" data-tip="AI Assistant">
+            <a href="<%= Docuseal::CHATGPT_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
+              <%= svg_icon('brand_openai', class: 'w-8 h-8') %>
+            </a>
+          </div>
+        <% end %>
       </div>
       <a href="mailto:<%= Docuseal::SUPPORT_EMAIL %>" target="_blank" class="w-full block mt-4 underline text-center">
         <%= Docuseal::SUPPORT_EMAIL %>

app/views/shared/_turbo_drawer.html.erb

@@ -1,7 +1,7 @@
 <turbo-frame id="drawer">
   <turbo-modal class="modal modal-open items-start !animate-none justify-end overflow-y-auto !justify-normal md:!justify-end" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>">
     <div class="absolute top-0 bottom-0 right-0 left-0" data-action="click:turbo-modal#close"></div>
-    <div class="bg-base-100 min-h-screen max-h-screen relative w-full relative overflow-y-auto">
+    <div class="bg-base-100 min-h-screen max-h-screen relative w-full relative">
       <% if local_assigns[:title] %>
         <div class="flex justify-between bg-base-100 py-2 px-4 items-center border-b pb-2 font-medium">
           <span>

app/views/submissions/_value.html.erb

@@ -1,5 +1,5 @@
 <% align = field.dig('preferences', 'align') %>
-<field-value dir="auto" class="flex absolute text-[1.5vw] lg:text-base <%= align == 'right' ? 'justify-end' : (align == 'center' ? 'justify-center' : '') %>" style="width: <%= area['w'] * 100 %>%; height: <%= area['h'] * 100 %>%; left: <%= area['x'] * 100 %>%; top: <%= area['y'] * 100 %>%">
+<field-value dir="auto" class="flex absolute text-[1.5vw] lg:text-base <%= align == 'right' ? 'justify-end' : (align == 'center' ? 'justify-center' : '') %>" style="width: <%= area['w'] * 100 %>%; height: <%= area['h'] * 100 %>%; left: <%= area['x'] * 100 %>%; top: <%= area['y'] * 100 %>%; <%= "font-size: #{field['preferences']['font_size']}pt" if field.dig('preferences', 'font_size') %>">
   <% if field['type'].in?(['signature', 'image', 'initials', 'stamp']) %>
     <img class="object-contain mx-auto" src="<%= attachments_index[value].url %>" loading="lazy">
   <% elsif field['type'].in?(['file', 'payment']) %>

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/show.html.erb

@@ -2,7 +2,6 @@
 <% 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">
@@ -29,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>
@@ -42,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/submitter_mailer/completed_email.html.erb

@@ -1,5 +1,5 @@
-<% if @email_config %>
-  <%= render 'custom_content', content: @email_config.value['body'], submitter: @submitter %>
+<% if @body.present? %>
+  <%= render 'custom_content', content: @body, submitter: @submitter %>
 <% else %>
   <p>Hi there,</p>
   <p>"<%= @submitter.submission.template.name %>" form has been completed by <%= @submitter.submission.submitters.order(:completed_at).map { |e| e.name || e.email || e.phone }.join(', ') %>.</p>

app/views/templates_preferences/show.html.erb

@@ -24,7 +24,7 @@
           <%= ff.label :bcc_completed, class: 'label' do %>
             <span class="flex items-center space-x-1 justify-between w-full">
               <span>
-                Completed documents BCC address
+                Completed documents notification BCC address
               </span>
             </span>
           <% end %>
@@ -82,7 +82,8 @@
         <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| %>
+            <% configs = AccountConfigs.find_or_initialize_for_key(current_account, AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY).value %>
+            <%= f.fields_for :preferences, Struct.new(:documents_copy_email_subject, :documents_copy_email_body, :documents_copy_email_enabled, :documents_copy_email_attach_audit).new(@template.preferences['documents_copy_email_subject'].presence || configs['subject'], @template.preferences['documents_copy_email_body'].presence || configs['body'], @template.preferences['documents_copy_email_enabled'], configs['attach_audit_log'] != false && @template.preferences['documents_copy_email_attach_audit'] != false) 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 +99,18 @@
                   <%= 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 pt-2.5 px-1 mb-2">
+                <span>
+                  Attach Audit Log PDF to the email
+                </span>
+                <%= ff.check_box :documents_copy_email_attach_audit, { checked: ff.object.documents_copy_email_attach_audit != false, class: 'toggle', onchange: 'this.form.requestSubmit()', disabled: configs['attach_audit_log'] == false }, 'true', 'false' %>
+              </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' %>
@@ -108,6 +121,53 @@
           <% end %>
         </div>
       </div>
+      <div class="collapse collapse-arrow join-item border border-base-300">
+        <input type="checkbox" name="accordion">
+        <div class="collapse-title text-xl font-medium">
+          Completed notification email
+        </div>
+        <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_alert3"></toggle-on-submit>
+            <% configs = AccountConfigs.find_or_initialize_for_key(current_account, AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY).value %>
+            <%= f.fields_for :preferences, Struct.new(:completed_notification_email_subject, :completed_notification_email_body, :completed_notification_email_enabled, :completed_notification_email_attach_audit).new(@template.preferences['completed_notification_email_subject'].presence || configs['subject'], @template.preferences['completed_notification_email_body'].presence || configs['body'], @template.preferences['completed_notification_email_enabled'], configs['attach_audit_log'] != false && @template.preferences['completed_notification_email_attach_audit'] != false) do |ff| %>
+              <div class="form-control">
+                <%= ff.label :completed_notification_email_subject, 'Email subject', class: 'label' %>
+                <%= ff.text_field :completed_notification_email_subject, required: true, class: 'base-input', dir: 'auto' %>
+              </div>
+              <div class="form-control">
+                <div class="flex items-center">
+                  <%= ff.label :completed_notification_email_body, 'Email body', class: 'label' %>
+                  <span class="tooltip tooltip-right" data-tip="Use following placeholders text: <%= AccountConfig::DEFAULT_VALUES.dig(AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY, 'body').scan(/{{.*?}}/).join(', ') %>">
+                    <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+                  </span>
+                </div>
+                <autoresize-textarea>
+                  <%= ff.text_area :completed_notification_email_body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
+                </autoresize-textarea>
+              </div>
+              <div class="flex items-center justify-between pt-2.5 px-1 mb-2">
+                <span>
+                  Attach Audit Log PDF to the email
+                </span>
+                <%= ff.check_box :completed_notification_email_attach_audit, { checked: ff.object.completed_notification_email_attach_audit != false, class: 'toggle', onchange: 'this.form.requestSubmit()', disabled: configs['attach_audit_log'] == false }, 'true', 'false' %>
+              </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 :completed_notification_email_enabled, { checked: ff.object.completed_notification_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' %>
+              <div class="flex justify-center">
+                <span id="email_saved_alert3" class="text-sm invisible font-normal mt-0.5">Changes have been saved</span>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
     </div>
   </div>
   <% if show_api %>

app/views/user_initials/edit.html.erb

@@ -16,7 +16,7 @@
     <%= 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>
+        <canvas data-target="signature-form.canvas" class="bg-white border border-base-300 w-full 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' } %>

app/views/user_signatures/edit.html.erb

@@ -16,7 +16,7 @@
     <%= form_for @user_config, url: user_signature_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>
+        <canvas data-target="signature-form.canvas" class="bg-white border border-base-300 w-full 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' } %>

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' %>

config/application.rb

@@ -19,7 +19,7 @@ module DocuSeal
   class Application < Rails::Application
     config.load_defaults 7.1
 
-    config.autoload_lib(ignore: %w[assets tasks])
+    config.autoload_lib(ignore: %w[assets tasks puma])
 
     config.active_storage.routes_prefix = ''
 

config/boot.rb

@@ -2,41 +2,7 @@
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-if ENV['RAILS_ENV'] == 'production' && ENV['SECRET_KEY_BASE'].to_s.empty?
-  require 'dotenv'
-  require 'securerandom'
-
-  dotenv_path = "#{ENV.fetch('WORKDIR', '.')}/docuseal.env"
-
-  unless File.exist?(dotenv_path)
-    default_env = <<~TEXT
-      DATABASE_URL= # keep empty to use sqlite or specify postgresql database URL
-      SECRET_KEY_BASE=#{SecureRandom.hex(64)}
-    TEXT
-
-    File.write(dotenv_path, default_env)
-  end
-
-  database_url = ENV.fetch('DATABASE_URL', nil)
-
-  Dotenv.load(dotenv_path)
-
-  ENV['DATABASE_URL'] = ENV['DATABASE_URL'].to_s.empty? ? database_url : ENV.fetch('DATABASE_URL', nil)
-end
-
-if ENV['DATABASE_URL'].to_s.split('@').last.to_s.split('/').first.to_s.include?('_')
-  require 'addressable'
-
-  url = Addressable::URI.parse(ENV.fetch('DATABASE_URL', ''))
-
-  ENV['DATABASE_HOST'] = url.host
-  ENV['DATABASE_PORT'] = (url.port || 5432).to_s
-  ENV['DATABASE_USER'] = url.user
-  ENV['DATABASE_PASSWORD'] = url.password
-  ENV['DATABASE_NAME'] = url.path.to_s.delete_prefix('/')
-
-  ENV.delete('DATABASE_URL')
-end
+require_relative 'dotenv'
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

config/database.yml

@@ -1,7 +1,7 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15) %>
+  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15).to_i + ENV.fetch('SIDEKIQ_THREADS', 5).to_i %>
 
 development:
   <<: *default
@@ -22,12 +22,14 @@ production:
 <% elsif ENV['DATABASE_URL'].to_s.empty? %>
   adapter: sqlite3
   database: <%= ENV['WORKDIR'] || '.' %>/db.sqlite3
+  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15).to_i + ENV.fetch('SIDEKIQ_THREADS', 5).to_i %>
+  timeout: 5000
 <% elsif ENV['DATABASE_URL'].match?(/\Apostgres/) %>
   <<: *default
   url: <%= ENV['DATABASE_URL'] %>
 <% elsif ENV['DATABASE_URL'].match?(/\Amysql/) %>
   adapter: mysql2
   encoding: utf8mb4
-  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15) %>
+  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15).to_i + ENV.fetch('SIDEKIQ_THREADS', 5).to_i %>
   url: <%= ENV['DATABASE_URL'] %>
 <% end %>

config/dotenv.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+if ENV['RAILS_ENV'] == 'production' && ENV['SECRET_KEY_BASE'].to_s.empty?
+  require 'dotenv'
+  require 'securerandom'
+
+  dotenv_path = "#{ENV.fetch('WORKDIR', '.')}/docuseal.env"
+
+  unless File.exist?(dotenv_path)
+    default_env = <<~TEXT
+      DATABASE_URL= # keep empty to use sqlite or specify postgresql database URL
+      SECRET_KEY_BASE=#{SecureRandom.hex(64)}
+    TEXT
+
+    File.write(dotenv_path, default_env)
+  end
+
+  database_url = ENV.fetch('DATABASE_URL', nil)
+
+  Dotenv.load(dotenv_path)
+
+  ENV['DATABASE_URL'] = ENV['DATABASE_URL'].to_s.empty? ? database_url : ENV.fetch('DATABASE_URL', nil)
+end
+
+if ENV['DATABASE_URL'].to_s.split('@').last.to_s.split('/').first.to_s.include?('_')
+  require 'addressable'
+
+  url = Addressable::URI.parse(ENV.fetch('DATABASE_URL', ''))
+
+  ENV['DATABASE_HOST'] = url.host
+  ENV['DATABASE_PORT'] = (url.port || 5432).to_s
+  ENV['DATABASE_USER'] = url.user
+  ENV['DATABASE_PASSWORD'] = url.password
+  ENV['DATABASE_NAME'] = url.path.to_s.delete_prefix('/')
+
+  ENV.delete('DATABASE_URL')
+end
+
+if ENV['REDIS_URL'].to_s.empty?
+  require 'digest'
+
+  redis_password = Digest::SHA1.hexdigest("redis#{ENV.fetch('SECRET_KEY_BASE', '')}")
+
+  ENV['REDIS_URL'] = "redis://default:#{redis_password}@0.0.0.0:6379/0"
+  ENV['LOCAL_REDIS_URL'] = ENV.fetch('REDIS_URL', nil)
+end

config/environments/development.rb

@@ -47,7 +47,7 @@ Rails.application.configure do
     config.cache_store = :null_store
   end
 
-  config.active_job.queue_adapter = :sidekiq if defined?(Sidekiq)
+  config.active_job.queue_adapter = :sidekiq
 
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :disk

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.
 
@@ -25,7 +27,7 @@ Rails.application.configure do
   config.action_controller.perform_caching = true
   config.active_record.sqlite3_production_warning = false
 
-  config.active_job.queue_adapter = :sidekiq if defined?(Sidekiq)
+  config.active_job.queue_adapter = :sidekiq
 
   # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
   # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).

config/environments/test.rb

@@ -44,7 +44,7 @@ Rails.application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  config.active_job.queue_adapter = :test
+  config.active_job.queue_adapter = :sidekiq
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr

config/initializers/sidekiq.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-if defined?(Sidekiq)
-  require 'sidekiq/web'
+require 'sidekiq/web' if defined?(Puma)
 
+if !ENV['SIDEKIQ_BASIC_AUTH_PASSWORD'].to_s.empty? && defined?(Sidekiq::Web)
   Sidekiq::Web.use(Rack::Auth::Basic) do |_, password|
-    next true if Rails.env.development?
-
     ActiveSupport::SecurityUtils.secure_compare(
       Digest::SHA256.hexdigest(password),
       Digest::SHA256.hexdigest(ENV.fetch('SIDEKIQ_BASIC_AUTH_PASSWORD'))
     )
   end
-
-  Sidekiq.strict_args!
 end
+
+Sidekiq.strict_args!

config/puma.rb

@@ -5,7 +5,9 @@
 # Any libraries that use thread pools should be configured to match
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
-#
+
+require_relative 'dotenv'
+
 max_threads_count = ENV.fetch('RAILS_MAX_THREADS', 15)
 min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count }
 threads min_threads_count, max_threads_count
@@ -41,5 +43,10 @@ workers ENV.fetch('WEB_CONCURRENCY', 0)
 #
 # preload_app!
 
-# Allow puma to be restarted by `bin/rails restart` command.
-plugin :tmp_restart
+if ENV['MULTITENANT'] != 'true' || ENV['DEMO'] == 'true'
+  require_relative '../lib/puma/plugin/redis_server'
+  require_relative '../lib/puma/plugin/sidekiq_embed'
+
+  plugin :sidekiq_embed
+  plugin :redis_server
+end

config/routes.rb

@@ -2,7 +2,12 @@
 
 Rails.application.routes.draw do
   mount LetterOpenerWeb::Engine, at: '/letter_opener' if Rails.env.development?
-  mount Sidekiq::Web => '/sidekiq' if defined?(Sidekiq)
+
+  if !Docuseal.multitenant? && defined?(Sidekiq::Web)
+    authenticated :user, ->(u) { u.sidekiq? } do
+      mount Sidekiq::Web => '/jobs'
+    end
+  end
 
   root 'dashboard#index'
 
@@ -71,6 +76,7 @@ Rails.application.routes.draw do
   resources :template_sharings_testing, only: %i[create]
   resources :templates, only: %i[index], controller: 'templates_dashboard'
   resources :templates, only: %i[new create edit update show destroy] do
+    resource :debug, only: %i[show], controller: 'templates_debug' if Rails.env.development?
     resources :documents, only: %i[create], controller: 'template_documents'
     resources :restore, only: %i[create], controller: 'templates_restore'
     resources :archived, only: %i[index], controller: 'templates_archived_submissions'

config/sidekiq.yml

@@ -7,3 +7,4 @@ queues:
 
 production:
   :concurrency: 15
+  :max_retries: 5

db/migrate/20240624102526_add_index_on_external_id.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddIndexOnExternalId < ActiveRecord::Migration[7.1]
+  def change
+    add_index :submitters, :external_id
+    add_index :templates, :external_id
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_06_04_070648) do
+ActiveRecord::Schema[7.1].define(version: 2024_06_24_102526) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -200,6 +200,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_06_04_070648) do
     t.text "preferences", null: false
     t.text "metadata", null: false
     t.index ["email"], name: "index_submitters_on_email"
+    t.index ["external_id"], name: "index_submitters_on_external_id"
     t.index ["slug"], name: "index_submitters_on_slug", unique: true
     t.index ["submission_id"], name: "index_submitters_on_submission_id"
   end
@@ -242,6 +243,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_06_04_070648) do
     t.text "preferences", null: false
     t.index ["account_id"], name: "index_templates_on_account_id"
     t.index ["author_id"], name: "index_templates_on_author_id"
+    t.index ["external_id"], name: "index_templates_on_external_id"
     t.index ["folder_id"], name: "index_templates_on_folder_id"
     t.index ["slug"], name: "index_templates_on_slug", unique: true
   end

lib/abilities/template_conditions.rb

@@ -5,13 +5,18 @@ module Abilities
     module_function
 
     def collection(user, ability: nil)
-      shared_ids =
-        Template.joins(:template_sharings)
-                .where(template_sharings: { ability:,
-                                            account_id: [user.account_id, TemplateSharing::ALL_ID] }.compact)
-                .select(:id)
+      template_ids = Template.where(account_id: user.account_id).select(:id)
 
-      Template.where(account_id: user.account_id).or(Template.where(id: shared_ids))
+      shared_ids =
+        TemplateSharing.where({ ability:,
+                                account_id: [user.account_id, TemplateSharing::ALL_ID] }.compact)
+                       .select(:template_id)
+
+      join_query = Template.arel_table
+                           .join(Arel::Nodes::TableAlias.new(template_ids.arel.union(shared_ids.arel), 'union_ids'))
+                           .on(Template.arel_table[:id].eq(Arel::Table.new(:union_ids)[:id]))
+
+      Template.joins(join_query.join_sources.first)
     end
 
     def entity(template, user:, ability: nil)

lib/docuseal.rb

@@ -11,6 +11,7 @@ module Docuseal
   DISCORD_URL = 'https://discord.gg/qygYCDGck9'
   TWITTER_URL = 'https://twitter.com/docusealco'
   TWITTER_HANDLE = '@docusealco'
+  CHATGPT_URL = 'https://chatgpt.com/g/g-9hg8AAw0r-docuseal'
   SUPPORT_EMAIL = 'support@docuseal.co'
   HOST = ENV.fetch('HOST', 'localhost')
   CONSOLE_URL = if Rails.env.development?

lib/puma/plugin/redis_server.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'puma/plugin'
+
+# rubocop:disable Metrics
+Puma::Plugin.create do
+  def start(launcher)
+    return if ENV['LOCAL_REDIS_URL'].to_s.empty?
+
+    @puma_pid = $PROCESS_ID
+
+    launcher.events.on_booted do
+      @redis_server_pid = fork_redis
+    end
+
+    in_background { monitor_redis }
+
+    at_exit do
+      stop_redis_server if Process.pid == @puma_pid
+    end
+
+    launcher.events.on_stopped { stop_redis_server }
+    launcher.events.on_restart { stop_redis_server }
+  end
+
+  private
+
+  def monitor_redis
+    loop do
+      if redis_dead?
+        Process.kill(:INT, @puma_pid)
+
+        break
+      end
+
+      sleep 5
+    end
+  end
+
+  def redis_dead?
+    return false unless @redis_server_pid
+
+    Process.waitpid(@redis_server_pid, Process::WNOHANG)
+
+    false
+  rescue Errno::ECHILD, Errno::ESRCH
+    true
+  end
+
+  def fork_redis
+    fork do
+      Process.setsid
+
+      Dir.chdir(ENV.fetch('WORKDIR', nil)) unless ENV['WORKDIR'].to_s.empty?
+
+      exec('redis-server', '--requirepass', Digest::SHA1.hexdigest("redis#{ENV.fetch('SECRET_KEY_BASE', '')}"),
+           out: '/dev/null')
+    end
+  end
+
+  def stop_redis_server
+    if @redis_server_pid
+      Process.kill(:INT, @redis_server_pid)
+      Process.wait(@redis_server_pid)
+    end
+  rescue Errno::ECHILD, Errno::ESRCH
+    nil
+  end
+end
+# rubocop:enable Metrics

lib/puma/plugin/sidekiq_embed.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'puma/plugin'
+
+# rubocop:disable Metrics
+Puma::Plugin.create do
+  def config(cfg)
+    return if cfg.instance_variable_get(:@options)[:workers] <= 0
+
+    cfg.on_worker_boot { start_sidekiq! }
+
+    cfg.on_worker_shutdown { @sidekiq&.stop }
+    cfg.on_refork { @sidekiq&.stop }
+  end
+
+  def start(launcher)
+    launcher.events.on_booted do
+      next if Puma.stats_hash[:workers].to_i != 0
+
+      start_sidekiq!
+    end
+
+    launcher.events.on_stopped { Thread.new { @sidekiq&.stop }.join }
+    launcher.events.on_restart { Thread.new { @sidekiq&.stop }.join }
+  end
+
+  def fire_event(config, event)
+    arr = config[:lifecycle_events][event]
+
+    arr.each(&:call)
+
+    arr.clear
+  end
+
+  def start_sidekiq!
+    Thread.new do
+      wait_for_redis!
+
+      configs = Sidekiq.configure_embed do |config|
+        config.logger.level = Logger::INFO
+        sidekiq_config = YAML.load_file('config/sidekiq.yml')
+        config.queues = sidekiq_config['queues']
+        config.concurrency = ENV.fetch('SIDEKIQ_THREADS', 5).to_i
+        config.merge!(sidekiq_config)
+        config[:max_retries] = 13
+
+        ActiveSupport.run_load_hooks(:sidekiq_config, config)
+      end.instance_variable_get(:@config)
+
+      @sidekiq = Sidekiq::Launcher.new(configs, embedded: true)
+
+      @sidekiq.run
+
+      fire_event(configs, :startup)
+    end
+  end
+
+  def wait_for_redis!
+    attempt = 0
+
+    loop do
+      attempt += 1
+
+      sleep (attempt - 1) / 10.0
+
+      RedisClient.new(url: ENV.fetch('REDIS_URL', nil)).call('GET', '1')
+
+      break
+    rescue RedisClient::CannotConnectError
+      raise('Unable to connect to redis') if attempt > 10
+    end
+  end
+end
+# rubocop:enable Metrics

lib/submission_events.rb

@@ -22,7 +22,7 @@ module SubmissionEvents
 
   def build_tracking_param(submitter, event_type = 'click_email')
     Base64.urlsafe_encode64(
-      [submitter.slug, event_type, Rails.application.secret_key_base].join(':')
+      Digest::SHA1.digest([submitter.slug, event_type, Rails.application.secret_key_base].join(':'))
     ).first(TRACKING_PARAM_LENGTH)
   end
 

lib/submissions/create_from_submitters.rb

@@ -159,20 +159,37 @@ module Submissions
           values[f['uuid']].present? && f['type'] == 'phone'
         end&.dig('uuid')
 
-      submission.submitters.new(
-        email:,
-        phone: (attrs[:phone] || values[phone_field_uuid]).to_s.gsub(/[^0-9+]/, ''),
-        name: attrs[:name],
-        external_id: attrs[:external_id].presence || attrs[:application_key],
-        completed_at: attrs[:completed].present? ? Time.current : nil,
-        sent_at: mark_as_sent && email.present? && is_order_sent ? Time.current : nil,
-        values: values.except(phone_field_uuid),
-        metadata: attrs[:metadata] || {},
-        preferences: preferences.merge(submitter_preferences)
-                                .merge({ default_values: attrs[:values] }.compact_blank)
-                                .except('bcc_completed'),
-        uuid:
-      )
+      submitter =
+        submission.submitters.new(
+          email:,
+          phone: (attrs[:phone] || values[phone_field_uuid]).to_s.gsub(/[^0-9+]/, ''),
+          name: attrs[:name],
+          external_id: attrs[:external_id].presence || attrs[:application_key],
+          completed_at: attrs[:completed].present? ? Time.current : nil,
+          sent_at: mark_as_sent && email.present? && is_order_sent ? Time.current : nil,
+          values: values.except(phone_field_uuid),
+          metadata: attrs[:metadata] || {},
+          preferences: preferences.merge(submitter_preferences)
+                                  .merge({ default_values: attrs[:values] }.compact_blank)
+                                  .except('bcc_completed'),
+          uuid:
+        )
+
+      assign_completed_attributes(submitter) if submitter.completed_at?
+
+      submitter
+    end
+
+    def assign_completed_attributes(submitter)
+      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.submission.account.timezone).to_date.to_s : v
+      end
+
+      submitter
     end
   end
 end

lib/submissions/generate_result_attachments.rb

@@ -120,7 +120,11 @@ module Submissions
 
           width = page.box.width
           height = page.box.height
-          font_size = (([page.box.width, page.box.height].min / A4_SIZE[0].to_f) * FONT_SIZE).to_i
+
+          preferences_font_size = field.dig('preferences', 'font_size').then { |num| num.present? ? num.to_i : nil }
+
+          font_size   = preferences_font_size
+          font_size ||= (([page.box.width, page.box.height].min / A4_SIZE[0].to_f) * FONT_SIZE).to_i
 
           value = submitter.values[field['uuid']]
 
@@ -265,7 +269,7 @@ module Submissions
             lines = layouter.fit([text], area['w'] * width, height).lines
             box_height = lines.sum(&:height)
 
-            if box_height > (area['h'] * height) + 1
+            if preferences_font_size.blank? && box_height > (area['h'] * height) + 1
               text = HexaPDF::Layout::TextFragment.create(value,
                                                           font: pdf.fonts.add(FONT_NAME),
                                                           font_size: (font_size / 1.4).to_i)
@@ -275,7 +279,7 @@ module Submissions
               box_height = lines.sum(&:height)
             end
 
-            if box_height > (area['h'] * height) + 1
+            if preferences_font_size.blank? && box_height > (area['h'] * height) + 1
               text = HexaPDF::Layout::TextFragment.create(value,
                                                           font: pdf.fonts.add(FONT_NAME),
                                                           font_size: (font_size / 1.9).to_i)

lib/submitters.rb

@@ -73,7 +73,7 @@ module Submitters
       next if submitter.email.blank?
       next if submitter.preferences['send_email'] == false
 
-      SendSubmitterInvitationEmailJob.perform_later('submitter_id' => submitter.id)
+      SendSubmitterInvitationEmailJob.perform_async('submitter_id' => submitter.id)
     end
   end
 end

lib/submitters/create_stamp_attachment.rb

@@ -14,6 +14,14 @@ module Submitters
     module_function
 
     def call(submitter, with_logo: true)
+      attachment = build_attachment(submitter, with_logo:)
+
+      attachment.save!
+
+      attachment
+    end
+
+    def build_attachment(submitter, with_logo: true)
       image = generate_stamp_image(submitter, with_logo:)
 
       image_data = image.write_to_buffer('.png')
@@ -22,11 +30,9 @@ module Submitters
 
       attachment = submitter.attachments.joins(:blob).find_by(blob: { checksum: })
 
-      attachment || ActiveStorage::Attachment.create!(
+      attachment || submitter.attachments_attachments.new(
         blob: ActiveStorage::Blob.create_and_upload!(io: StringIO.new(image_data), filename: 'stamp.png'),
-        metadata: { analyzed: true, identified: true, width: image.width, height: image.height },
-        name: 'attachments',
-        record: submitter
+        metadata: { analyzed: true, identified: true, width: image.width, height: image.height }
       )
     end
 
@@ -61,10 +67,11 @@ module Submitters
     end
 
     def build_text_image(submitter)
-      time = I18n.l(submitter.completed_at.in_time_zone(submitter.account.timezone), format: :long,
-                                                                                     locale: submitter.account.locale)
+      time = I18n.l(submitter.completed_at.in_time_zone(submitter.submission.account.timezone),
+                    format: :long,
+                    locale: submitter.submission.account.locale)
 
-      timezone = TimeUtils.timezone_abbr(submitter.account.timezone, submitter.completed_at)
+      timezone = TimeUtils.timezone_abbr(submitter.submission.account.timezone, submitter.completed_at)
 
       name = if submitter.name.present? && submitter.email.present?
                "#{submitter.name} #{submitter.email}"
@@ -80,7 +87,7 @@ module Submitters
                ''
              end
 
-      digitally_signed_by = I18n.t(:digitally_signed_by, locale: submitter.account.locale)
+      digitally_signed_by = I18n.t(:digitally_signed_by, locale: submitter.submission.account.locale)
 
       text = %(<span size="90">#{digitally_signed_by}:\n<b>#{name}</b>\n#{role}#{time} #{timezone}</span>)
 

lib/submitters/form_configs.rb

@@ -5,20 +5,21 @@ module Submitters
     DEFAULT_KEYS = [AccountConfig::FORM_COMPLETED_BUTTON_KEY,
                     AccountConfig::FORM_COMPLETED_MESSAGE_KEY,
                     AccountConfig::FORM_WITH_CONFETTI_KEY,
+                    AccountConfig::FORM_PREFILL_SIGNATURE_KEY,
                     AccountConfig::ALLOW_TYPED_SIGNATURE].freeze
 
     module_function
 
     def call(submitter, keys = [])
-      configs = submitter.submission.account.account_configs
-                         .where(key: DEFAULT_KEYS + keys)
+      configs = submitter.submission.account.account_configs.where(key: DEFAULT_KEYS + keys)
 
-      completed_button = configs.find { |e| e.key == AccountConfig::FORM_COMPLETED_BUTTON_KEY }&.value || {}
-      completed_message = configs.find { |e| e.key == AccountConfig::FORM_COMPLETED_MESSAGE_KEY }&.value || {}
-      with_typed_signature = configs.find { |e| e.key == AccountConfig::ALLOW_TYPED_SIGNATURE }&.value != false
-      with_confetti = configs.find { |e| e.key == AccountConfig::FORM_WITH_CONFETTI_KEY }&.value != false
+      completed_button = find_safe_value(configs, AccountConfig::FORM_COMPLETED_BUTTON_KEY) || {}
+      completed_message = find_safe_value(configs, AccountConfig::FORM_COMPLETED_MESSAGE_KEY) || {}
+      with_typed_signature = find_safe_value(configs, AccountConfig::ALLOW_TYPED_SIGNATURE) != false
+      with_confetti = find_safe_value(configs, AccountConfig::FORM_WITH_CONFETTI_KEY) != false
+      prefill_signature = find_safe_value(configs, AccountConfig::FORM_PREFILL_SIGNATURE_KEY) != false
 
-      attrs = { completed_button:, with_typed_signature:, with_confetti:, completed_message: }
+      attrs = { completed_button:, with_typed_signature:, with_confetti:, completed_message:, prefill_signature: }
 
       keys.each do |key|
         attrs[key.to_sym] = configs.find { |e| e.key == key.to_s }&.value
@@ -26,5 +27,9 @@ module Submitters
 
       attrs
     end
+
+    def find_safe_value(configs, key)
+      configs.find { |e| e.key == key }&.value
+    end
   end
 end

lib/submitters/maybe_assign_default_browser_signature.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Submitters
+  module MaybeAssignDefaultBrowserSignature
+    SIGNED_UUID_PURPPOSE = 'signature'
+
+    module_function
+
+    def call(submitter, params, cookies = nil, attachments = [])
+      if (value = params[:signature_src].presence || params[:signature].presence)
+        find_or_create_signature_from_value(submitter, value, attachments)
+      elsif params[:signed_signature_uuids].present?
+        find_storage_signature(submitter, params[:signed_signature_uuids], attachments)
+      elsif cookies
+        find_session_signature(submitter, cookies, attachments)
+      end
+    end
+
+    def find_or_create_signature_from_value(submitter, value, attachments)
+      _, attachment = Submitters::NormalizeValues.normalize_attachment_value(value,
+                                                                             'signature',
+                                                                             submitter.account,
+                                                                             attachments,
+                                                                             submitter)
+
+      attachment.record ||= submitter
+
+      attachment.save!
+
+      attachment
+    end
+
+    def sign_signature_uuid(uuid)
+      ApplicationRecord.signed_id_verifier.generate(uuid, purpose: SIGNED_UUID_PURPPOSE)
+    end
+
+    def verify_signature_uuid(signed_uuid)
+      ApplicationRecord.signed_id_verifier.verified(signed_uuid, purpose: SIGNED_UUID_PURPPOSE)
+    end
+
+    def find_storage_signature(submitter, signed_uuids, attachments)
+      signed_uuid = signed_uuids[submitter.email]
+
+      return if signed_uuid.blank?
+
+      uuid = verify_signature_uuid(signed_uuid)
+
+      return if uuid.blank?
+
+      find_signature_from_uuid(submitter, uuid, attachments)
+    end
+
+    def find_session_signature(submitter, cookies, attachments)
+      values =
+        begin
+          JSON.parse(cookies.encrypted[:signature_uuids].presence || '{}')
+        rescue JSON::ParserError
+          {}
+        end
+
+      return if values.blank?
+
+      uuid = values[submitter.email]
+
+      return if uuid.blank?
+
+      find_signature_from_uuid(submitter, uuid, attachments)
+    end
+
+    def find_signature_from_uuid(submitter, uuid, attachments)
+      signature_attachment = ActiveStorage::Attachment.find_by(uuid:)
+
+      return unless signature_attachment
+
+      return if signature_attachment.record.email != submitter.email
+
+      existing_attachment = attachments.find do |a|
+        a.blob_id == signature_attachment.blob_id && submitter.id == a.record_id
+      end
+
+      return existing_attachment if existing_attachment
+
+      submitter.attachments_attachments.create_or_find_by!(blob_id: signature_attachment.blob_id)
+    end
+  end
+end

lib/submitters/maybe_assign_default_email_signature.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Submitters
+  module MaybeAssignDefaultEmailSignature
+    module_function
+
+    def call(submitter, params, attachments)
+      return if params[:t].present? && params[:t] != SubmissionEvents.build_tracking_param(submitter, 'click_email')
+      return if params[:t].blank? && !submitter.submission_events.exists?(event_type: :click_email)
+
+      signature_attachment = find_previous_signature(submitter)
+
+      return if signature_attachment.blank?
+
+      existing_attachment = attachments.find do |a|
+        a.blob_id == signature_attachment.blob_id && submitter.id == a.record_id
+      end
+
+      return existing_attachment if existing_attachment
+
+      submitter.attachments_attachments.create_or_find_by!(blob_id: signature_attachment.blob_id)
+    end
+
+    def find_previous_signature(submitter)
+      return if submitter.email.blank?
+
+      submitters_query =
+        Submitter.where(email: submitter.email)
+                 .where.not(completed_at: nil)
+                 .where(SubmissionEvent.where(Submitter.arel_table[:id].eq(SubmissionEvent.arel_table[:submitter_id]))
+                                       .where(event_type: :click_email).limit(1).arel.exists)
+
+      ActiveStorage::Attachment.where(name: :signature, record: submitters_query).order(:id).last
+    end
+  end
+end