fix download indicator

.eslintrc

@@ -9,7 +9,7 @@
   "rules": {
     "vue/no-deprecated-html-element-is": 0,
     "vue/no-mutating-props": 0,
-    "vue/no-v-html": 0
+    "vue/one-component-per-file": 0
   },
   "parserOptions": {
     "ecmaVersion": 2022,

.rubocop.yml

@@ -44,7 +44,7 @@ Layout/LineLength:
   AllowedPatterns: ['\A\s*#']
 
 Metrics/AbcSize:
-  Max: 40
+  Max: 45
 
 Metrics/ModuleLength:
   Max: 500

Dockerfile

@@ -2,7 +2,9 @@ FROM ruby:3.2.2-alpine3.18 as fonts
 
 WORKDIR /fonts
 
-RUN apk --no-cache add wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt
+RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt
+
+RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'
 
 FROM ruby:3.2.2-alpine3.18 as webpack
 
@@ -34,15 +36,14 @@ FROM ruby:3.2.2-alpine3.18 as app
 
 ENV RAILS_ENV=production
 ENV BUNDLE_WITHOUT="development:test"
-ENV PIDFILE=/dev/null
 
 WORKDIR /app
 
-RUN apk add --no-cache build-base sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils vips-heif libc6-compat ttf-freefont && mkdir /fonts
+RUN apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils vips-heif libc6-compat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
 
 COPY ./Gemfile ./Gemfile.lock ./
 
-RUN bundle update --bundler && bundle install && rm -rf ~/.bundle /usr/local/bundle/cache && ruby -e "puts Dir['/usr/local/bundle/**/{spec,rdoc,resources/shared,resources/collation,resources/locales}']" | xargs rm -rf
+RUN apk add --no-cache build-base && bundle update --bundler && bundle install && apk del build-base && rm -rf ~/.bundle /usr/local/bundle/cache && ruby -e "puts Dir['/usr/local/bundle/**/{spec,rdoc,resources/shared,resources/collation,resources/locales}']" | xargs rm -rf
 
 COPY ./bin ./bin
 COPY ./app ./app
@@ -55,6 +56,7 @@ COPY ./tmp ./tmp
 COPY LICENSE README.md Rakefile config.ru .version ./
 
 COPY --from=fonts /fonts/GoNotoKurrent-Regular.ttf /fonts/GoNotoKurrent-Bold.ttf /fonts/DancingScript-Regular.otf /fonts/OFL.txt /fonts
+COPY --from=fonts /fonts/FreeSans.ttf /usr/share/fonts/freefont
 COPY --from=webpack /app/public/packs ./public/packs
 
 RUN ln -s /fonts /app/public/fonts
@@ -64,4 +66,4 @@ WORKDIR /data/docuseal
 ENV WORKDIR=/data/docuseal
 
 EXPOSE 3000
-CMD ["/app/bin/rails", "server"]
+CMD ["/app/bin/bundle", "exec", "puma", "-C", "/app/config/puma.rb", "--dir", "/app"]

README.md

@@ -51,11 +51,13 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 - User roles
 - Automated reminders
 - Invitation and identify verification via SMS
+- Conditional fields and formulas
+- Bulk send with CSV, XLSX spreadsheet import
 - SSO / SAML
 - Template creation with HTML API ([Guide](https://www.docuseal.co/guides/create-pdf-document-fillable-form-with-html-api))
 - Template creation with PDF or DOCX and field tags API ([Guide](https://www.docuseal.co/guides/use-embedded-text-field-tags-in-the-pdf-to-create-a-fillable-form))
-- Embedded signing form ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue) or [JavaScript](https://www.docuseal.co/docs/embedded))
+- Embedded signing form ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.co/docs/embedded))
-- Embedded document form builder ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue) or [JavaScript](https://www.docuseal.co/docs/embedded))
+- Embedded document form builder ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.co/docs/embedded))
 - [Learn more](https://www.docuseal.co/pricing)
 
 ## Deploy
@@ -65,9 +67,6 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 | [<img alt="Deploy on Heroku" src="https://www.herokucdn.com/deploy/button.svg" height="40">](https://heroku.com/deploy?template=https://github.com/docusealco/docuseal-heroku) | [<img alt="Deploy on Railway" src="https://railway.app/button.svg" height="40">](https://railway.app/template/IGoDnc?referralCode=ruU7JR)|
 |**DigitalOcean**|**Render**|
 | [<img alt="Deploy on DigitalOcean" src="https://www.deploytodo.com/do-btn-blue.svg" height="40">](https://cloud.digitalocean.com/apps/new?repo=https://github.com/docusealco/docuseal-digitalocean/tree/master&refcode=421d50f53990) | [<img alt="Deploy to Render" src="https://render.com/images/deploy-to-render-button.svg" height="40">](https://render.com/deploy?repo=https://github.com/docusealco/docuseal-render)
-|**Koyeb**|**Elestio**|
-| [<img alt="Deploy on Koyeb" src="https://www.koyeb.com/static/images/deploy/button.svg" height="40">](https://app.koyeb.com/deploy?name=docuseal&type=docker&image=docker.io/docuseal/docuseal&env[PORT]=8000&env[DATABASE_URL]=CHANGE_ME&env[SECRET_KEY_BASE]=CHANGE_ME&ports=8000;http;/) | [<img alt="Deploy on Elestio" src="https://pub-da36157c854648669813f3f76c526c2b.r2.dev/deploy-on-elestio-black.png">](https://dash.elest.io/deploy?soft=DocuSeal&id=339) |
-
 
 #### Docker
 
@@ -100,3 +99,9 @@ At DocuSeal we have expertise and technologies to make documents creation, filli
 
 Distributed under the AGPLv3 License. See [LICENSE](https://github.com/docusealco/docuseal/blob/master/LICENSE) for more information.
 Unless otherwise noted, all files © 2023 DocuSeal LLC.
+
+## Tools
+
+- [Signature Maker](https://www.docuseal.co/online-signature)
+- [Sign Document Online](https://www.docuseal.co/sign-documents-online)
+- [Fill PDF Online](https://www.docuseal.co/fill-pdf)

app/controllers/account_configs_controller.rb

@@ -8,7 +8,8 @@ class AccountConfigsController < ApplicationController
     AccountConfig::ALLOW_TYPED_SIGNATURE,
     AccountConfig::FORCE_MFA,
     AccountConfig::ALLOW_TO_RESUBMIT,
-    AccountConfig::ESIGNING_PREFERENCE_KEY
+    AccountConfig::ESIGNING_PREFERENCE_KEY,
+    AccountConfig::FORM_WITH_CONFETTI_KEY
   ].freeze
 
   InvalidKey = Class.new(StandardError)

app/controllers/api/api_base_controller.rb

@@ -19,10 +19,14 @@ module Api
       render json: { error: e.message }, status: :unprocessable_entity
     end
 
+    rescue_from RateLimit::LimitApproached do |e|
+      Rollbar.error(e) if defined?(Rollbar)
+
+      render json: { error: 'Too many requests' }, status: :too_many_requests
+    end
+
     if Rails.env.production?
       rescue_from CanCan::AccessDenied do |e|
-        Rollbar.warning(e) if defined?(Rollbar)
-
         render json: { error: e.message }, status: :forbidden
       end
 
@@ -39,8 +43,8 @@ module Api
       result = relation.order(id: :desc)
                        .limit([params.fetch(:limit, DEFAULT_LIMIT).to_i, MAX_LIMIT].min)
 
-      result = result.where(relation.arel_table[:id].lt(params[:after])) if params[:after].present?
+      result = result.where(id: ...params[:after].to_i) if params[:after].present?
-      result = result.where(relation.arel_table[:id].gt(params[:before])) if params[:before].present?
+      result = result.where(id: (params[:before].to_i + 1)...) if params[:before].present?
 
       result
     end

app/controllers/api/submissions_controller.rb

@@ -161,11 +161,11 @@ module Api
 
     def submissions_params
       permitted_attrs = [
-        :send_email, :send_sms, :bcc_completed, :completed_redirect_url,
+        :send_email, :send_sms, :bcc_completed, :completed_redirect_url, :reply_to,
         {
           message: %i[subject body],
           submitters: [[:send_email, :send_sms, :completed_redirect_url, :uuid, :name, :email, :role,
-                        :completed, :phone, :application_key, :external_id,
+                        :completed, :phone, :application_key, :external_id, :reply_to,
                         { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
                           fields: [%i[name default_value title description
                                       readonly validation_pattern invalid_message]] }]]

app/controllers/api/submitters_autocomplete_controller.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class SubmittersAutocompleteController < ApiBaseController
-    load_and_authorize_resource :submitter, parent: false
-
-    SELECT_COLUMNS = %w[email phone name].freeze
-    LIMIT = 100
-
-    def index
-      submitters = search_submitters(@submitters)
-
-      values = submitters.limit(LIMIT).group(SELECT_COLUMNS.join(', ')).pluck(SELECT_COLUMNS.join(', '))
-
-      attrs = values.map { |row| SELECT_COLUMNS.zip(row).to_h }
-      attrs = attrs.uniq { |e| e[params[:field]] } if params[:field].present?
-
-      render json: attrs
-    end
-
-    private
-
-    def search_submitters(submitters)
-      if SELECT_COLUMNS.include?(params[:field])
-        column = Submitter.arel_table[params[:field].to_sym]
-
-        term = "#{params[:q].downcase}%"
-
-        submitters.where(column.matches(term, false, true))
-      else
-        Submitters.search(submitters, params[:q])
-      end
-    end
-  end
-end

app/controllers/api/submitters_controller.rb

@@ -10,6 +10,7 @@ module Api
       submitters = submitters.where(external_id: params[:application_key]) if params[:application_key].present?
       submitters = submitters.where(external_id: params[:external_id]) if params[:external_id].present?
       submitters = submitters.where(submission_id: params[:submission_id]) if params[:submission_id].present?
+      submitters = maybe_filder_by_completed_at(submitters, params)
 
       submitters = paginate(
         submitters.preload(:template, :submission, :submission_events,
@@ -81,6 +82,18 @@ module Api
 
     private
 
+    def maybe_filder_by_completed_at(submitters, params)
+      if params[:completed_after].present?
+        submitters = submitters.where(completed_at: Time.zone.parse(params[:completed_after])..)
+      end
+
+      if params[:completed_before].present?
+        submitters = submitters.where(completed_at: ..Time.zone.parse(params[:completed_before]))
+      end
+
+      submitters
+    end
+
     def assign_submitter_attrs(submitter, attrs)
       submitter.email = Submissions.normalize_email(attrs[:email]) if attrs.key?(:email)
       submitter.phone = attrs[:phone].to_s.gsub(/[^0-9+]/, '') if attrs.key?(:phone)

app/controllers/api/template_folders_autocomplete_controller.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class TemplateFoldersAutocompleteController < ApiBaseController
-    load_and_authorize_resource :template_folder, parent: false
-
-    LIMIT = 100
-
-    def index
-      template_folders = @template_folders.joins(:templates).where(templates: { archived_at: nil }).distinct
-      template_folders = TemplateFolders.search(template_folders, params[:q]).limit(LIMIT)
-
-      render json: template_folders.as_json(only: %i[name archived_at])
-    end
-  end
-end

app/controllers/api/templates_controller.rb

@@ -49,6 +49,14 @@ module Api
         @template.folder = TemplateFolders.find_or_create_by_name(current_user, folder_name)
       end
 
+      Array.wrap(params[:roles].presence || params.dig(:template, :roles).presence).each_with_index do |role, index|
+        if (item = @template.submitters[index])
+          item['name'] = role
+        else
+          @template.submitters << { 'name' => role, 'uuid' => SecureRandom.uuid }
+        end
+      end
+
       archived = params.key?(:archived) ? params[:archived] : params.dig(:template, :archived)
 
       if archived.in?([true, false])
@@ -83,21 +91,10 @@ module Api
     end
 
     def template_params
-      permit_params = [
-        :name,
-        { schema: [%i[attachment_uuid name]],
-          submitters: [%i[name uuid]],
-          fields: [[:uuid, :submitter_uuid, :name, :type, :required, :readonly, :default_value,
-                    { preferences: {},
-                      conditions: [%i[field_uuid value action]],
-                      options: [%i[value uuid]],
-                      areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]] }
-      ]
-
       if params.key?(:template)
-        params.require(:template).permit(*permit_params)
+        params.require(:template).permit(:name, submitters: [%i[name uuid]])
       else
-        params.permit(*permit_params)
+        params.permit(:name, submitters: [%i[name uuid]])
       end
     end
   end

app/controllers/api/templates_documents_controller.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class TemplatesDocumentsController < ApiBaseController
-    load_and_authorize_resource :template
-
-    def create
-      return head :unprocessable_entity if params[:blobs].blank? && params[:files].blank?
-
-      documents = Templates::CreateAttachments.call(@template, params)
-
-      schema = documents.map do |doc|
-        { attachment_uuid: doc.uuid, name: doc.filename.base }
-      end
-
-      render json: {
-        schema:,
-        documents: documents.as_json(
-          methods: %i[metadata signed_uuid],
-          include: {
-            preview_images: { methods: %i[url metadata filename] }
-          }
-        )
-      }
-    rescue Templates::CreateAttachments::PdfEncrypted
-      render json: { error: 'PDF encrypted' }, status: :unprocessable_entity
-    end
-  end
-end

app/controllers/application_controller.rb

@@ -22,6 +22,12 @@ class ApplicationController < ActionController::Base
     redirect_to request.path
   end
 
+  rescue_from RateLimit::LimitApproached do |e|
+    Rollbar.error(e) if defined?(Rollbar)
+
+    redirect_to request.referer, alert: 'Too many requests', status: :too_many_requests
+  end
+
   if Rails.env.production?
     rescue_from CanCan::AccessDenied do |e|
       Rollbar.warning(e) if defined?(Rollbar)

app/controllers/console_redirect_controller.rb

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

app/controllers/errors_controller.rb

@@ -22,6 +22,8 @@ class ErrorsController < ActionController::Base
 
     respond_to do |f|
       f.json do
+        set_cors_headers
+
         render json: { status: error_status_code }, status: error_status_code
       end
 
@@ -31,6 +33,14 @@ class ErrorsController < ActionController::Base
 
   private
 
+  def set_cors_headers
+    headers['Access-Control-Allow-Origin'] = '*'
+    headers['Access-Control-Allow-Methods'] = 'POST, GET, PUT, PATCH, DELETE, OPTIONS'
+    headers['Access-Control-Allow-Headers'] = '*'
+    headers['Access-Control-Max-Age'] = '1728000'
+    headers['Access-Control-Allow-Credentials'] = true
+  end
+
   def error_status_code
     @error_status_code ||=
       ActionDispatch::ExceptionWrapper.new(request.env,

app/controllers/passwords_controller.rb

@@ -5,6 +5,12 @@ class PasswordsController < Devise::PasswordsController
     attribute :user
   end
 
+  def create
+    super do |resource|
+      resource.errors.clear unless Docuseal.multitenant?
+    end
+  end
+
   def update
     super do |resource|
       Current.user = resource

app/controllers/personalization_settings_controller.rb

@@ -17,7 +17,11 @@ class PersonalizationSettingsController < ApplicationController
   end
 
   def create
-    @account_config.save!
+    if @account_config.value != false && @account_config.value.blank?
+      @account_config.destroy!
+    else
+      @account_config.save!
+    end
 
     redirect_back(fallback_location: settings_personalization_path, notice: 'Settings have been saved.')
   end
@@ -40,6 +44,8 @@ class PersonalizationSettingsController < ApplicationController
   def account_config_params
     attrs = params.require(:account_config).permit!
 
+    return attrs if attrs[:value].is_a?(String)
+
     attrs[:value]&.transform_values! do |value|
       if value.in?(%w[true false])
         value == 'true'

app/controllers/send_submission_email_controller.rb

@@ -21,6 +21,8 @@ class SendSubmissionEmailController < ApplicationController
         Submitter.find_by!(slug: params[:submitter_slug])
       end
 
+    RateLimit.call("send-email-#{@submitter.id}", limit: 2, ttl: 5.minutes)
+
     SubmitterMailer.documents_copy_email(@submitter, sig: true).deliver_later!
 
     respond_to do |f|

app/controllers/submitters_autocomplete_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class SubmittersAutocompleteController < ApplicationController
+  load_and_authorize_resource :submitter, parent: false
+
+  SELECT_COLUMNS = %w[email phone name].freeze
+  LIMIT = 100
+
+  def index
+    submitters = search_submitters(@submitters)
+
+    values = submitters.limit(LIMIT).group(SELECT_COLUMNS.join(', ')).pluck(SELECT_COLUMNS.join(', '))
+
+    attrs = values.map { |row| SELECT_COLUMNS.zip(row).to_h }
+    attrs = attrs.uniq { |e| e[params[:field]] } if params[:field].present?
+
+    render json: attrs
+  end
+
+  private
+
+  def search_submitters(submitters)
+    if SELECT_COLUMNS.include?(params[:field])
+      column = Submitter.arel_table[params[:field].to_sym]
+
+      term = "#{params[:q].downcase}%"
+
+      submitters.where(column.matches(term, false, true))
+    else
+      Submitters.search(submitters, params[:q])
+    end
+  end
+end

app/controllers/template_documents_controller.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class TemplateDocumentsController < ApplicationController
+  load_and_authorize_resource :template
+
+  def create
+    return head :unprocessable_entity if params[:blobs].blank? && params[:files].blank?
+
+    documents = Templates::CreateAttachments.call(@template, params)
+
+    schema = documents.map do |doc|
+      { attachment_uuid: doc.uuid, name: doc.filename.base }
+    end
+
+    render json: {
+      schema:,
+      documents: documents.as_json(
+        methods: %i[metadata signed_uuid],
+        include: {
+          preview_images: { methods: %i[url metadata filename] }
+        }
+      )
+    }
+  rescue Templates::CreateAttachments::PdfEncrypted
+    render json: { error: 'PDF encrypted' }, status: :unprocessable_entity
+  end
+end

app/controllers/template_folders_autocomplete_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TemplateFoldersAutocompleteController < ApplicationController
+  load_and_authorize_resource :template_folder, parent: false
+
+  LIMIT = 100
+
+  def index
+    template_folders = @template_folders.joins(:templates).where(templates: { archived_at: nil }).distinct
+    template_folders = TemplateFolders.search(template_folders, params[:q]).limit(LIMIT)
+
+    render json: template_folders.as_json(only: %i[name archived_at])
+  end
+end

app/controllers/templates_archived_submissions_controller.rb

@@ -6,7 +6,7 @@ class TemplatesArchivedSubmissionsController < ApplicationController
 
   def index
     @submissions = @submissions.where.not(archived_at: nil)
-    @submissions = Submissions.search(@submissions, params[:q])
+    @submissions = Submissions.search(@submissions, params[:q], search_values: true)
 
     @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
   rescue ActiveRecord::RecordNotFound

app/controllers/templates_controller.rb

@@ -8,7 +8,7 @@ class TemplatesController < ApplicationController
   def show
     submissions = @template.submissions.accessible_by(current_ability)
     submissions = submissions.active if @template.archived_at.blank?
-    submissions = Submissions.search(submissions, params[:q])
+    submissions = Submissions.search(submissions, params[:q], search_values: true)
 
     @base_submissions = submissions
 
@@ -67,6 +67,12 @@ class TemplatesController < ApplicationController
     end
   end
 
+  def update
+    @template.update!(template_params)
+
+    head :ok
+  end
+
   def destroy
     notice =
       if params[:permanently].present?
@@ -86,6 +92,22 @@ class TemplatesController < ApplicationController
 
   private
 
+  def template_params
+    params.require(:template).permit(
+      :name,
+      { schema: [%i[attachment_uuid name]],
+        submitters: [%i[name uuid]],
+        fields: [[:uuid, :submitter_uuid, :name, :type,
+                  :required, :readonly, :default_value,
+                  :title, :description,
+                  { preferences: {},
+                    conditions: [%i[field_uuid value action]],
+                    options: [%i[value uuid]],
+                    validation: %i[message pattern],
+                    areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]] }
+    )
+  end
+
   def authorized_clone_account_id?(account_id)
     true_user.account_id.to_s == account_id.to_s || true_user.account.linked_accounts.exists?(id: account_id)
   end
@@ -98,10 +120,6 @@ class TemplatesController < ApplicationController
     end
   end
 
-  def template_params
-    params.require(:template).permit(:name)
-  end
-
   def load_base_template
     return if params[:base_template_id].blank?
 

app/javascript/application.js

@@ -3,6 +3,7 @@ import { encodeMethodIntoRequestBody } from '@hotwired/turbo-rails/app/javascrip
 
 import { createApp, reactive } from 'vue'
 import TemplateBuilder from './template_builder/builder'
+import ImportList from './template_builder/import_list'
 
 import ToggleVisible from './elements/toggle_visible'
 import DisableHidden from './elements/disable_hidden'
@@ -20,6 +21,7 @@ import FolderAutocomplete from './elements/folder_autocomplete'
 import SignatureForm from './elements/signature_form'
 import SubmitForm from './elements/submit_form'
 import PromptPassword from './elements/prompt_password'
+import EmailsTextarea from './elements/emails_textarea'
 
 import * as TurboInstantClick from './lib/turbo_instant_click'
 
@@ -53,6 +55,7 @@ window.customElements.define('folder-autocomplete', FolderAutocomplete)
 window.customElements.define('signature-form', SignatureForm)
 window.customElements.define('submit-form', SubmitForm)
 window.customElements.define('prompt-password', PromptPassword)
+window.customElements.define('emails-textarea', EmailsTextarea)
 
 document.addEventListener('turbo:before-fetch-request', encodeMethodIntoRequestBody)
 document.addEventListener('turbo:submit-end', async (event) => {
@@ -89,7 +92,9 @@ window.customElements.define('template-builder', class extends HTMLElement {
       withPhone: this.dataset.withPhone === 'true',
       withLogo: this.dataset.withLogo !== 'false',
       editable: this.dataset.editable !== 'false',
+      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
       withPayment: this.dataset.withPayment === 'true',
+      isPaymentConnected: this.dataset.isPaymentConnected === 'true',
       withFormula: this.dataset.withFormula === 'true',
       withConditions: this.dataset.withConditions === 'true',
       currencies: (this.dataset.currencies || '').split(',').filter(Boolean),
@@ -107,3 +112,23 @@ window.customElements.define('template-builder', class extends HTMLElement {
     this.appElem?.remove()
   }
 })
+
+window.customElements.define('import-list', class extends HTMLElement {
+  connectedCallback () {
+    this.appElem = document.createElement('div')
+
+    this.app = createApp(ImportList, {
+      template: JSON.parse(this.dataset.template),
+      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content
+    })
+
+    this.app.mount(this.appElem)
+
+    this.appendChild(this.appElem)
+  }
+
+  disconnectedCallback () {
+    this.app?.unmount()
+    this.appElem?.remove()
+  }
+})

app/javascript/application.scss

@@ -83,6 +83,11 @@ button[disabled] .enabled {
   bottom: auto;
 }
 
+.tooltip-pre:before {
+  white-space: pre;
+  text-align: left;
+}
+
 .tooltip-bottom-end:after {
   transform: translateX(-25%);
   border-color: transparent transparent var(--tooltip-color) transparent;

app/javascript/elements/emails_textarea.js

@@ -0,0 +1,56 @@
+const emailRegexp = /([^@;,<>\s]+@[^@;,<>\s]+)/g
+
+export default class extends HTMLElement {
+  connectedCallback () {
+    if (this.dataset.limit) {
+      this.textarea.addEventListener('input', () => {
+        const emails = this.textarea.value.match(emailRegexp) || []
+
+        this.updateCounter(emails.length)
+      })
+    }
+  }
+
+  updateCounter (count) {
+    let counter = document.getElementById('emails_counter')
+    let bulkMessage = document.getElementById('bulk_message')
+
+    if (count < 2) {
+      counter?.remove()
+
+      return
+    }
+
+    if ((count + 10) > this.dataset.limit) {
+      if (!counter) {
+        counter = document.createElement('span')
+
+        counter.id = 'emails_counter'
+        counter.classList.add('text-xs', 'right-0', 'absolute')
+        counter.style.bottom = '-15px'
+
+        this.textarea.parentNode.append(counter)
+      }
+
+      counter.innerText = `${count} / ${this.dataset.limit}`
+    }
+
+    if (this.dataset.bulkEnabled !== 'true') {
+      if (!bulkMessage) {
+        bulkMessage = document.createElement('span')
+
+        bulkMessage.id = 'bulk_message'
+        bulkMessage.classList.add('text-xs', 'left-0', 'absolute')
+        bulkMessage.style.bottom = '-15px'
+
+        this.textarea.parentNode.append(bulkMessage)
+      }
+
+      bulkMessage.innerHTML = '<a class="link" data-turbo="false" href="/upgrade">Upgrade</a> to bulk send multiple recipients'
+    }
+  }
+
+  get textarea () {
+    return this.querySelector('textarea')
+  }
+}

app/javascript/elements/folder_autocomplete.js

@@ -20,7 +20,7 @@ export default class extends HTMLElement {
   fetch = (text, resolve) => {
     const queryParams = new URLSearchParams({ q: text })
 
-    fetch('/api/template_folders_autocomplete?' + queryParams).then(async (resp) => {
+    fetch('/template_folders_autocomplete?' + queryParams).then(async (resp) => {
       const items = await resp.json()
 
       resolve(items)

app/javascript/elements/submitter_autocomplete.js

@@ -28,6 +28,8 @@ export default class extends HTMLElement {
 
       if (textarea && item[field]) {
         textarea.value = textarea.value.replace(/[^;,\s]+$/, item[field] + ' ')
+
+        textarea.dispatchEvent(new Event('input', { bubbles: true }))
       }
     })
   }
@@ -38,7 +40,7 @@ export default class extends HTMLElement {
     if (q) {
       const queryParams = new URLSearchParams({ q, field: this.dataset.field })
 
-      this.currentFetch ||= fetch('/api/submitters_autocomplete?' + queryParams)
+      this.currentFetch ||= fetch('/submitters_autocomplete?' + queryParams)
 
       this.currentFetch.then(async (resp) => {
         const items = await resp.json()

app/javascript/form.js

@@ -17,6 +17,7 @@ window.customElements.define('submission-form', class extends HTMLElement {
       attribution: this.dataset.attribution !== 'false',
       withConfetti: this.dataset.withConfetti !== 'false',
       withTypedSignature: this.dataset.withTypedSignature !== 'false',
+      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
       values: reactive(JSON.parse(this.dataset.values)),
       completedButton: JSON.parse(this.dataset.completedButton),
       completedRedirectUrl: this.dataset.completedRedirectUrl,

app/javascript/submission_form/area.vue

@@ -157,6 +157,7 @@
       ref="textContainer"
       dir="auto"
       class="flex items-center px-0.5 w-full"
+      :class="alignClasses[field.preferences?.align]"
     >
       <span v-if="Array.isArray(modelValue)">
         {{ modelValue.join(', ') }}
@@ -167,6 +168,7 @@
       <span
         v-else
         class="whitespace-pre-wrap"
+        :class="{ 'w-full': field.preferences?.align }"
       >{{ modelValue }}</span>
     </div>
   </div>
@@ -253,6 +255,13 @@ export default {
         phone: this.t('phone')
       }
     },
+    alignClasses () {
+      return {
+        center: 'text-center',
+        left: 'text-left',
+        right: 'text-right'
+      }
+    },
     option () {
       return this.field.options.find((o) => o.uuid === this.area.option_uuid)
     },
@@ -338,17 +347,19 @@ export default {
   },
   watch: {
     modelValue () {
-      if (this.field.type === 'text' && this.$refs.textContainer && (this.textOverflowChars === 0 || (this.textOverflowChars - 4) > this.modelValue.length)) {
+      this.$nextTick(() => {
-        this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? this.modelValue.length : 0
+        if (['date', 'text', 'number'].includes(this.field.type) && this.$refs.textContainer && (this.textOverflowChars === 0 || (this.textOverflowChars - 4) > `${this.modelValue}`.length)) {
-      }
+          this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? `${this.modelValue}`.length : 0
+        }
+      })
     }
   },
   mounted () {
-    if (this.field.type === 'text' && this.$refs.textContainer) {
+    this.$nextTick(() => {
-      this.$nextTick(() => {
+      if (['date', 'text', 'number'].includes(this.field.type) && this.$refs.textContainer) {
-        this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? this.modelValue.length : 0
+        this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? `${this.modelValue}`.length : 0
-      })
+      }
-    }
+    })
   },
   methods: {
     optionValue (option) {

app/javascript/submission_form/attachment_step.vue

@@ -41,6 +41,13 @@
         :name="`values[${field.uuid}][]`"
       >
     </template>
+    <div
+      v-if="field.description && !modelValue.length"
+      dir="auto"
+      class="mb-3 px-1"
+    >
+      <MarkdownContent :string="field.description" />
+    </div>
     <FileDropzone
       :message="`${t('upload')} ${field.name || t('files')}${field.required ? '' : ` (${t('optional')})`}`"
       :submitter-slug="submitterSlug"
@@ -53,12 +60,14 @@
 
 <script>
 import FileDropzone from './dropzone'
+import MarkdownContent from './markdown_content'
 import { IconPaperclip, IconTrashX } from '@tabler/icons-vue'
 
 export default {
   name: 'AttachmentStep',
   components: {
     FileDropzone,
+    MarkdownContent,
     IconPaperclip,
     IconTrashX
   },

app/javascript/submission_form/completed.vue

@@ -16,7 +16,8 @@
     <div class="space-y-3 mt-5">
       <a
         v-if="completedButton.url"
-        :href="completedButton.url"
+        :href="sanitizeHref(completedButton.url)"
+        rel="noopener noreferrer nofollow"
         class="white-button flex items-center w-full"
       >
         <span>
@@ -211,9 +212,14 @@ export default {
       fileRequests.reduce(
         (prevPromise, request) => prevPromise.then(() => request()),
         Promise.resolve()
-      )
+      ).finally(() => {
-
+        this.isDownloading = false
-      this.isDownloading = false
+      })
+    },
+    sanitizeHref (href) {
+      if (href && href.trim().match(/^((?:https?:\/\/)|\/)/)) {
+        return href.replace(/javascript:/g, '')
+      }
     },
     downloadSafariIos (urls) {
       const fileRequests = urls.map((url) => {

app/javascript/submission_form/crop_canvas.js

@@ -1,4 +1,4 @@
-function cropCanvasAndExportToPNG (canvas) {
+function cropCanvasAndExportToPNG (canvas, { errorOnTooSmall } = { errorOnTooSmall: false }) {
   const ctx = canvas.getContext('2d')
 
   const width = canvas.width
@@ -33,6 +33,10 @@ function cropCanvasAndExportToPNG (canvas) {
   croppedCanvas.height = croppedHeight
   const croppedCtx = croppedCanvas.getContext('2d')
 
+  if (errorOnTooSmall && (croppedWidth < 20 || croppedHeight < 20)) {
+    return Promise.reject(new Error('Image too small'))
+  }
+
   croppedCtx.drawImage(canvas, leftmost, topmost, croppedWidth, croppedHeight, 0, 0, croppedWidth, croppedHeight)
 
   return new Promise((resolve, reject) => {

app/javascript/submission_form/date_step.vue

@@ -1,11 +1,21 @@
 <template>
   <div dir="auto">
-    <div class="flex justify-between items-center w-full mb-2">
+    <div
+      class="flex justify-between items-center w-full"
+      :class="{ 'mb-2': !field.description }"
+    >
       <label
         :for="field.uuid"
         class="label text-2xl"
-      >{{ field.name && showFieldNames ? field.name : t('date') }}
+      >
-        <template v-if="!field.required">({{ t('optional') }})</template>
+        <MarkdownContent
+          v-if="field.title"
+          :string="field.title"
+        />
+        <template v-else>
+          {{ field.name && showFieldNames ? field.name : t('date') }}
+          <template v-if="!field.required">({{ t('optional') }})</template>
+        </template>
       </label>
       <button
         class="btn btn-outline btn-sm !normal-case font-normal"
@@ -15,6 +25,13 @@
         {{ t('set_today') }}
       </button>
     </div>
+    <div
+      v-if="field.description"
+      class="mb-3 px-1"
+      dir="auto"
+    >
+      <MarkdownContent :string="field.description" />
+    </div>
     <AppearsOn :field="field" />
     <div class="text-center">
       <input
@@ -33,11 +50,13 @@
 <script>
 import { IconCalendarCheck } from '@tabler/icons-vue'
 import AppearsOn from './appears_on'
+import MarkdownContent from './markdown_content'
 
 export default {
   name: 'DateStep',
   components: {
     IconCalendarCheck,
+    MarkdownContent,
     AppearsOn
   },
   inject: ['t'],

app/javascript/submission_form/form.vue

@@ -101,17 +101,32 @@
           />
           <div v-else-if="currentField.type === 'select'">
             <label
-              v-if="showFieldNames && currentField.name"
+              v-if="showFieldNames && (currentField.name || currentField.title)"
               :for="currentField.uuid"
               dir="auto"
-              class="label text-2xl mb-2"
+              class="label text-2xl"
-            >{{ currentField.name }}
+              :class="{ 'mb-2': !currentField.description }"
-              <template v-if="!currentField.required">({{ t('optional') }})</template>
+            >
+              <MarkdownContent
+                v-if="currentField.title"
+                :string="currentField.title"
+              />
+              <template v-else>
+                {{ currentField.name }}
+                <template v-if="!currentField.required">({{ t('optional') }})</template>
+              </template>
             </label>
             <div
               v-else
               class="py-1"
             />
+            <div
+              v-if="currentField.description"
+              dir="auto"
+              class="mb-3 px-1"
+            >
+              <MarkdownContent :string="currentField.description" />
+            </div>
             <AppearsOn :field="currentField" />
             <select
               :id="currentField.uuid"
@@ -140,13 +155,28 @@
           </div>
           <div v-else-if="currentField.type === 'radio'">
             <label
-              v-if="showFieldNames && currentField.name"
+              v-if="showFieldNames && (currentField.name || currentField.title)"
               :for="currentField.uuid"
               dir="auto"
-              class="label text-2xl mb-2"
+              class="label text-2xl"
-            >{{ currentField.name }}
+              :class="{ 'mb-2': !currentField.description }"
-              <template v-if="!currentField.required">({{ t('optional') }})</template>
+            >
+              <MarkdownContent
+                v-if="currentField.title"
+                :string="currentField.title"
+              />
+              <template v-else>
+                {{ currentField.name }}
+                <template v-if="!currentField.required">({{ t('optional') }})</template>
+              </template>
             </label>
+            <div
+              v-if="currentField.description"
+              dir="auto"
+              class="mb-3 px-1"
+            >
+              <MarkdownContent :string="currentField.description" />
+            </div>
             <div class="flex w-full max-h-44 overflow-y-auto">
               <div
                 v-if="!showFieldNames || (currentField.options.every((e) => !e.value) && currentField.options.length > 4)"
@@ -178,6 +208,7 @@
                       :name="`values[${currentField.uuid}]`"
                       :value="option.value || `${t('option')} ${index + 1}`"
                       :required="currentField.required"
+                      @click="scrollIntoField(currentField)"
                     >
                     <span class="text-xl">
                       {{ option.value || `${t('option')} ${index + 1}` }}
@@ -197,66 +228,77 @@
           />
           <div
             v-else-if="currentField.type === 'checkbox'"
-            class="flex w-full max-h-44 overflow-y-auto"
           >
-            <input
-              type="hidden"
-              name="cast_boolean"
-              value="true"
-            >
             <div
-              class="space-y-3.5 mx-auto"
+              v-if="currentField.description"
+              dir="auto"
+              class="mb-3 px-1"
             >
-              <template v-if="isAnonymousChecboxes || !showFieldNames">
+              <MarkdownContent :string="currentField.description" />
-                <span class="text-xl">
+            </div>
-                  {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ stepFields.length === currentStep + 1 ? t('submit') : t('next') }}</span>.
+            <div
-                </span>
+              class="flex w-full max-h-44 overflow-y-auto"
-                <input
+            >
-                  v-for="field in currentStepFields"
+              <input
-                  :key="field.uuid"
+                type="hidden"
-                  type="hidden"
+                name="cast_boolean"
-                  :name="`values[${field.uuid}]`"
+                value="true"
-                  :value="!!values[field.uuid]"
+              >
-                >
+              <div
-              </template>
+                class="space-y-3.5 mx-auto"
-              <template v-else>
+              >
-                <div
+                <template v-if="isAnonymousChecboxes || !showFieldNames">
-                  v-for="(field, index) in currentStepFields"
+                  <span class="text-xl">
-                  :key="field.uuid"
+                    {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ stepFields.length === currentStep + 1 ? t('submit') : t('next') }}</span>.
-                >
+                  </span>
-                  <label
+                  <input
-                    :for="field.uuid"
+                    v-for="field in currentStepFields"
-                    class="flex items-center space-x-3"
+                    :key="field.uuid"
+                    type="hidden"
+                    :name="`values[${field.uuid}]`"
+                    :value="!!values[field.uuid]"
                   >
-                    <input
+                </template>
-                      type="hidden"
+                <template v-else>
-                      :name="`values[${field.uuid}]`"
+                  <div
-                      :value="!!values[field.uuid]"
+                    v-for="(field, index) in currentStepFields"
+                    :key="field.uuid"
+                  >
+                    <label
+                      :for="field.uuid"
+                      class="flex items-center space-x-3"
                     >
-                    <input
+                      <input
-                      :id="field.uuid"
+                        type="hidden"
-                      type="checkbox"
+                        :name="`values[${field.uuid}]`"
-                      class="base-checkbox !h-7 !w-7"
+                        :value="!!values[field.uuid]"
-                      :oninvalid="`this.setCustomValidity('${t('please_check_the_box_to_continue')}')`"
+                      >
-                      :onchange="`this.setCustomValidity(validity.valueMissing ? '${t('please_check_the_box_to_continue')}' : '');`"
+                      <input
-                      :required="field.required"
+                        :id="field.uuid"
-                      :checked="!!values[field.uuid]"
+                        type="checkbox"
-                      @click="[scrollIntoField(field), values[field.uuid] = !values[field.uuid]]"
+                        class="base-checkbox !h-7 !w-7"
-                    >
+                        :oninvalid="`this.setCustomValidity('${t('please_check_the_box_to_continue')}')`"
-                    <span
+                        :onchange="`this.setCustomValidity(validity.valueMissing ? '${t('please_check_the_box_to_continue')}' : '');`"
-                      v-if="field.title"
+                        :required="field.required"
-                      class="text-xl"
+                        :checked="!!values[field.uuid]"
-                      v-html="field.title"
+                        @click="[scrollIntoField(field), values[field.uuid] = !values[field.uuid]]"
-                    />
+                      >
-                    <span
+                      <span
-                      v-else
+                        v-if="field.title"
-                      class="text-xl"
+                        class="text-xl"
-                    >
+                      >
-                      {{ field.name || field.type + ' ' + (index + 1) }}
+                        <MarkdownContent :string="field.title" />
-                    </span>
+                      </span>
-                  </label>
+                      <span
-                </div>
+                        v-else
-              </template>
+                        class="text-xl"
+                      >
+                        {{ field.name || field.type + ' ' + (index + 1) }}
+                      </span>
+                    </label>
+                  </div>
+                </template>
+              </div>
             </div>
           </div>
           <ImageStep
@@ -418,6 +460,7 @@ import PaymentStep from './payment_step'
 import TextStep from './text_step'
 import NumberStep from './number_step'
 import DateStep from './date_step'
+import MarkdownContent from './markdown_content'
 import FormCompleted from './completed'
 import { IconInnerShadowTop, IconArrowsDiagonal, IconWritingSign, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
 import AppearsOn from './appears_on'
@@ -459,6 +502,7 @@ export default {
     NumberStep,
     FormulaFieldAreas,
     PhoneStep,
+    MarkdownContent,
     PaymentStep,
     IconArrowsDiagonalMinimize2,
     FormCompleted
@@ -568,6 +612,11 @@ export default {
       required: false,
       default: () => ({})
     },
+    authenticityToken: {
+      type: String,
+      required: false,
+      default: ''
+    },
     i18n: {
       type: Object,
       required: false,
@@ -615,9 +664,6 @@ export default {
     queryParams () {
       return new URLSearchParams(window.location.search)
     },
-    authenticityToken () {
-      return document.querySelector('meta[name="csrf-token"]')?.content
-    },
     submitterSlug () {
       return this.submitter.slug
     },
@@ -654,7 +700,7 @@ export default {
         const prevStep = acc[acc.length - 1]
 
         if (this.checkFieldConditions(f)) {
-          if (f.type === 'checkbox' && Array.isArray(prevStep) && prevStep[0].type === 'checkbox') {
+          if (f.type === 'checkbox' && Array.isArray(prevStep) && prevStep[0].type === 'checkbox' && !f.description) {
             prevStep.push(f)
           } else {
             acc.push([f])
@@ -957,7 +1003,11 @@ export default {
           this.isSubmitting = false
         })
       }).catch(error => {
-        console.log(error)
+        if (error?.message === 'Image too small') {
+          alert('Signature is too small - please redraw.')
+        } else {
+          console.log(error)
+        }
       }).finally(() => {
         this.isSubmitting = false
       })

app/javascript/submission_form/image_step.vue

@@ -24,9 +24,17 @@
       :name="`values[${field.uuid}]`"
     >
   </div>
-  <div>
+  <div
+    v-if="!modelValue"
+  >
+    <div
+      v-if="field.description"
+      dir="auto"
+      class="mb-3 px-1"
+    >
+      <MarkdownContent :string="field.description" />
+    </div>
     <FileDropzone
-      v-if="!modelValue"
       :message="`${t('upload')} ${field.name || t('image')}${field.required ? '' : ` (${t('optional')})`}`"
       :submitter-slug="submitterSlug"
       :accept="'image/*'"
@@ -39,12 +47,14 @@
 <script>
 import FileDropzone from './dropzone'
 import { IconReload } from '@tabler/icons-vue'
+import MarkdownContent from './markdown_content'
 
 export default {
   name: 'ImageStep',
   components: {
     FileDropzone,
-    IconReload
+    IconReload,
+    MarkdownContent
   },
   inject: ['t'],
   props: {

app/javascript/submission_form/initials_step.vue

@@ -1,9 +1,20 @@
 <template>
   <div dir="auto">
-    <div class="flex justify-between items-center w-full mb-2">
+    <div
+      class="flex justify-between items-center w-full"
+      :class="{ 'mb-2': !field.description }"
+    >
       <label
         class="label text-2xl"
-      >{{ showFieldNames && field.name ? field.name : t('initials') }}</label>
+      >
+        <MarkdownContent
+          v-if="field.title"
+          :string="field.title"
+        />
+        <template v-else>
+          {{ showFieldNames && field.name ? field.name : t('initials') }}
+        </template>
+      </label>
       <div class="space-x-2 flex">
         <span
           v-if="isDrawInitials"
@@ -70,6 +81,13 @@
         </a>
       </div>
     </div>
+    <div
+      v-if="field.description"
+      dir="auto"
+      class="mb-3 px-1"
+    >
+      <MarkdownContent :string="field.description" />
+    </div>
     <AppearsOn :field="field" />
     <input
       :value="modelValue || computedPreviousValue"
@@ -105,6 +123,7 @@ import { cropCanvasAndExportToPNG } from './crop_canvas'
 import { IconReload, IconTextSize, IconSignature, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
 import SignaturePad from 'signature_pad'
 import AppearsOn from './appears_on'
+import MarkdownContent from './markdown_content'
 
 const scale = 3
 
@@ -115,6 +134,7 @@ export default {
     IconReload,
     IconTextSize,
     IconSignature,
+    MarkdownContent,
     IconArrowsDiagonalMinimize2
   },
   inject: ['baseUrl', 't'],

app/javascript/submission_form/markdown_content.vue

@@ -0,0 +1,75 @@
+<template>
+  <span>
+    <template
+      v-for="(item, index) in items"
+      :key="index"
+    >
+      <a
+        v-if="item.startsWith('<a') && item.endsWith('</a>')"
+        :href="sanitizeHref(extractAttr(item, 'href'))"
+        rel="noopener noreferrer nofollow"
+        :class="extractAttr(item, 'class') || 'link'"
+        target="_blank"
+      >
+        {{ extractText(item) }}
+      </a>
+      <b
+        v-else-if="item.startsWith('<b>') || item.startsWith('<strong>')"
+      >
+        {{ extractText(item) }}
+      </b>
+      <i
+        v-else-if="item.startsWith('<i>') || item.startsWith('<em>')"
+      >
+        {{ extractText(item) }}
+      </i>
+      <br
+        v-else-if="item === '<br>' || item === '\n'"
+      >
+      <template
+        v-else
+      >
+        {{ item }}
+      </template>
+    </template>
+  </span>
+</template>
+
+<script>
+import snarkdown from 'snarkdown'
+
+const htmlSplitRegexp = /(<a.+?<\/a>|<i>.+?<\/i>|<b>.+?<\/b>|<em>.+?<\/em>|<strong>.+?<\/strong>|<br>)/
+
+export default {
+  name: 'MarkdownContent',
+  props: {
+    string: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  },
+  computed: {
+    items () {
+      return snarkdown(this.string.replace(/\n/g, '<br>')).split(htmlSplitRegexp)
+    }
+  },
+  methods: {
+    sanitizeHref (href) {
+      if (href && href.trim().match(/^((?:https?:\/\/)|\/)/)) {
+        return href.replace(/javascript:/g, '')
+      }
+    },
+    extractAttr (text, attr) {
+      if (text.includes(attr)) {
+        return text.split(attr).pop().split('"')[1]
+      }
+    },
+    extractText (text) {
+      if (text) {
+        return text.match(/>(.+?)</)?.[1]
+      }
+    }
+  }
+}
+</script>

app/javascript/submission_form/multi_select_step.vue

@@ -1,10 +1,23 @@
 <template>
   <label
-    v-if="showFieldNames && field.name"
+    v-if="showFieldNames && (field.name || field.title)"
     :for="field.uuid"
     dir="auto"
-    class="label text-2xl mb-2"
+    class="label text-2xl"
-  >{{ field.name }}</label>
+    :class="{ 'mb-2': !field.description }"
+  ><MarkdownContent
+     v-if="field.title"
+     :string="field.title"
+   />
+    <template v-else>{{ field.name }}</template>
+  </label>
+  <div
+    v-if="field.description"
+    dir="auto"
+    class="mb-3 px-1"
+  >
+    <MarkdownContent :string="field.description" />
+  </div>
   <div class="flex w-full max-h-44 overflow-y-auto">
     <input
       v-if="modelValue.length === 0"
@@ -32,6 +45,7 @@
         <label
           :for="option.uuid"
           class="flex items-center space-x-3"
+          @click="scrollIntoField(field)"
         >
           <input
             :id="option.uuid"
@@ -53,8 +67,13 @@
 </template>
 
 <script>
+import MarkdownContent from './markdown_content'
+
 export default {
   name: 'MultiSelectStep',
+  components: {
+    MarkdownContent
+  },
   inject: ['t', 'scrollIntoField'],
   props: {
     field: {

app/javascript/submission_form/number_step.vue

@@ -1,11 +1,14 @@
 <template>
   <label
-    v-if="showFieldNames && field.name"
+    v-if="showFieldNames && (field.name || field.title)"
     :for="field.uuid"
     dir="auto"
     class="label text-2xl"
     :class="{ 'mb-2': !field.description }"
-  ><template v-if="field.title"><span v-html="field.title" /></template>
+  ><MarkdownContent
+     v-if="field.title"
+     :string="field.title"
+   />
     <template v-else>{{ field.name }}</template>
     <template v-if="!field.required">({{ t('optional') }})</template>
   </label>
@@ -15,9 +18,11 @@
   />
   <div
     v-if="field.description"
-    class="mb-3 px-1 text-lg"
+    dir="auto"
-    v-html="field.description"
+    class="mb-3 px-1"
-  />
+  >
+    <MarkdownContent :string="field.description" />
+  </div>
   <AppearsOn :field="field" />
   <div class="items-center flex">
     <input
@@ -41,11 +46,13 @@
 
 <script>
 import AppearsOn from './appears_on'
+import MarkdownContent from './markdown_content'
 
 export default {
   name: 'TextStep',
   components: {
-    AppearsOn
+    AppearsOn,
+    MarkdownContent
   },
   inject: ['t'],
   props: {

app/javascript/submission_form/phone_step.vue

@@ -2,10 +2,25 @@
   <div>
     <label
       :for="isCodeSent ? 'one_time_code' : field.uuid"
-      class="label text-2xl mb-2"
+      class="label text-2xl"
-    >{{ showFieldNames && field.name ? field.name : t('verified_phone_number') }}
+      :class="{ 'mb-2': !field.description }"
-      <template v-if="!field.required">({{ t('optional') }})</template>
+    >
+      <MarkdownContent
+        v-if="field.title"
+        :string="field.title"
+      />
+      <template v-else>
+        {{ showFieldNames && field.name ? field.name : t('verified_phone_number') }}
+        <template v-if="!field.required">({{ t('optional') }})</template>
+      </template>
     </label>
+    <div
+      v-if="field.description"
+      dir="auto"
+      class="mb-3 px-1"
+    >
+      <MarkdownContent :string="field.description" />
+    </div>
     <div>
       <input
         type="hidden"
@@ -53,14 +68,13 @@
         class="base-input !text-2xl w-full"
         autocomplete="tel"
         pattern="^\+[0-9\s\-]+$"
-        :oninvalid="`this.value ? this.setCustomValidity('${t('use_international_format')}...') : ''`"
-        oninput="this.setCustomValidity('')"
         type="tel"
         inputmode="tel"
         :required="field.required"
         placeholder="+1 234 567-8900"
         :name="`values[${field.uuid}]`"
-        @input="$emit('update:model-value', $event.target.value)"
+        @invalid="$event.target.value ? $event.target.setCustomValidity(`${t('use_international_format')}...`) : ''"
+        @input="[$event.target.setCustomValidity(''), $emit('update:model-value', $event.target.value)]"
         @focus="$emit('focus')"
       >
     </div>
@@ -68,6 +82,8 @@
 </template>
 
 <script>
+import MarkdownContent from './markdown_content'
+
 function throttle (func, delay) {
   let lastCallTime = 0
 
@@ -83,6 +99,9 @@ function throttle (func, delay) {
 
 export default {
   name: 'PhoneStep',
+  components: {
+    MarkdownContent
+  },
   inject: ['t', 'baseUrl'],
   props: {
     field: {

app/javascript/submission_form/signature_step.vue

@@ -1,9 +1,20 @@
 <template>
   <div dir="auto">
-    <div class="flex justify-between items-center w-full mb-2">
+    <div
+      class="flex justify-between items-center w-full"
+      :class="{ 'mb-2': !field.description }"
+    >
       <label
         class="label text-2xl"
-      >{{ showFieldNames && field.name ? field.name : t('signature') }}</label>
+      >
+        <MarkdownContent
+          v-if="field.title"
+          :string="field.title"
+        />
+        <template v-else>
+          {{ showFieldNames && field.name ? field.name : t('signature') }}
+        </template>
+      </label>
       <div class="space-x-2 flex">
         <span
           v-if="isTextSignature && field.preferences?.format !== 'typed'"
@@ -30,7 +41,7 @@
           <a
             id="type_text_button"
             href="#"
-            class="btn btn-outline btn-sm font-medium"
+            class="btn btn-outline btn-sm font-medium inline-flex flex-nowrap"
             @click.prevent="toggleTextInput"
           >
             <IconTextSize :width="16" />
@@ -45,7 +56,7 @@
           :data-tip="t('take_photo')"
         >
           <label
-            class="btn btn-outline btn-sm font-medium"
+            class="btn btn-outline btn-sm font-medium inline-flex flex-nowrap"
           >
             <IconCamera :width="16" />
             <input
@@ -91,6 +102,13 @@
         </a>
       </div>
     </div>
+    <div
+      v-if="field.description"
+      dir="auto"
+      class="mb-3 px-1"
+    >
+      <MarkdownContent :string="field.description" />
+    </div>
     <AppearsOn :field="field" />
     <input
       :value="modelValue || computedPreviousValue"
@@ -126,6 +144,7 @@ import { IconReload, IconCamera, IconSignature, IconTextSize, IconArrowsDiagonal
 import { cropCanvasAndExportToPNG } from './crop_canvas'
 import SignaturePad from 'signature_pad'
 import AppearsOn from './appears_on'
+import MarkdownContent from './markdown_content'
 
 let isFontLoaded = false
 
@@ -137,6 +156,7 @@ export default {
     AppearsOn,
     IconReload,
     IconCamera,
+    MarkdownContent,
     IconTextSize,
     IconSignature,
     IconArrowsDiagonalMinimize2
@@ -366,8 +386,8 @@ export default {
         return Promise.resolve({})
       }
 
-      return new Promise((resolve) => {
+      return new Promise((resolve, reject) => {
-        cropCanvasAndExportToPNG(this.$refs.canvas).then(async (blob) => {
+        cropCanvasAndExportToPNG(this.$refs.canvas, { errorOnTooSmall: true }).then(async (blob) => {
           const file = new File([blob], 'signature.png', { type: 'image/png' })
 
           if (this.isDirectUpload) {
@@ -409,6 +429,8 @@ export default {
               return resolve(attachment)
             })
           }
+        }).catch((error) => {
+          return reject(error)
         })
       })
     }

app/javascript/submission_form/text_step.vue

@@ -1,11 +1,14 @@
 <template>
   <label
-    v-if="showFieldNames && field.name"
+    v-if="showFieldNames && (field.name || field.title)"
     :for="field.uuid"
     dir="auto"
     class="label text-2xl"
     :class="{ 'mb-2': !field.description }"
-  ><template v-if="field.title"><span v-html="field.title" /></template>
+  ><MarkdownContent
+     v-if="field.title"
+     :string="field.title"
+   />
     <template v-else>{{ field.name }}</template>
     <template v-if="!field.required">({{ t('optional') }})</template>
   </label>
@@ -15,9 +18,11 @@
   />
   <div
     v-if="field.description"
-    class="mb-3 px-1 text-lg"
+    dir="auto"
-    v-html="field.description"
+    class="mb-3 px-1"
-  />
+  >
+    <MarkdownContent :string="field.description" />
+  </div>
   <AppearsOn :field="field" />
   <div class="items-center flex">
     <input
@@ -30,11 +35,11 @@
       :class="{ '!pr-11 -mr-10': !field.validation?.pattern }"
       :required="field.required"
       :pattern="field.validation?.pattern"
-      :oninvalid="field.validation?.message ? `this.setCustomValidity(${JSON.stringify(field.validation.message)})` : ''"
-      :oninput="field.validation?.message ? `this.setCustomValidity('')` : ''"
       :placeholder="`${t('type_here_')}${field.required ? '' : ` (${t('optional')})`}`"
       type="text"
       :name="`values[${field.uuid}]`"
+      @invalid="field.validation?.message ? $event.target.setCustomValidity(field.validation.message) : ''"
+      @input="field.validation?.message ? $event.target.setCustomValidity('') : ''"
       @focus="$emit('focus')"
     >
     <textarea
@@ -69,11 +74,13 @@
 <script>
 import { IconAlignBoxLeftTop } from '@tabler/icons-vue'
 import AppearsOn from './appears_on'
+import MarkdownContent from './markdown_content'
 
 export default {
   name: 'TextStep',
   components: {
     IconAlignBoxLeftTop,
+    MarkdownContent,
     AppearsOn
   },
   inject: ['t'],

app/javascript/template_builder/area.vue

@@ -42,7 +42,7 @@
         v-model="field.submitter_uuid"
         class="border-r"
         :compact="true"
-        :editable="editable && !defaultField"
+        :editable="editable && (!defaultField || defaultField.role !== submitter?.name)"
         :allow-add-new="!defaultSubmitters.length"
         :menu-classes="'dropdown-content bg-white menu menu-xs p-2 shadow rounded-box w-52 rounded-t-none -left-[1px] mt-[1px]'"
         :submitters="template.submitters"
@@ -99,7 +99,7 @@
     <div
       class="flex items-center h-full w-full"
       dir="auto"
-      :class="[bgColors[submitterIndex], field?.default_value ? '' : 'justify-center']"
+      :class="[bgColors[submitterIndex], field?.default_value ? (alignClasses[field.preferences?.align] || '') : 'justify-center']"
     >
       <span
         v-if="field"
@@ -211,6 +211,13 @@ export default {
     defaultName () {
       return this.buildDefaultName(this.field, this.template.fields)
     },
+    alignClasses () {
+      return {
+        center: 'justify-center',
+        left: 'justify-start',
+        right: 'justify-end'
+      }
+    },
     optionIndexText () {
       if (this.area.option_uuid && this.field.options) {
         return `${this.field.options.findIndex((o) => o.uuid === this.area.option_uuid) + 1}.`
@@ -301,17 +308,19 @@ export default {
   },
   watch: {
     'field.default_value' () {
-      if (this.field.type === 'text' && this.field.default_value && this.$refs.textContainer && (this.textOverflowChars === 0 || (this.textOverflowChars - 4) > this.field.default_value.length)) {
+      this.$nextTick(() => {
-        this.textOverflowChars = this.$el.clientHeight < this.$refs.textContainer.clientHeight ? this.field.default_value.length : 0
+        if (['date', 'text', 'number'].includes(this.field.type) && this.field.default_value && this.$refs.textContainer && (this.textOverflowChars === 0 || (this.textOverflowChars - 4) > `${this.field.default_value}`.length)) {
-      }
+          this.textOverflowChars = this.$el.clientHeight < this.$refs.textContainer.clientHeight ? `${this.field.default_value}`.length : 0
+        }
+      })
     }
   },
   mounted () {
-    if (this.field.type === 'text' && this.field.default_value && this.$refs.textContainer && (this.textOverflowChars === 0 || (this.textOverflowChars - 4) > this.field.default_value)) {
+    this.$nextTick(() => {
-      this.$nextTick(() => {
+      if (['date', 'text', 'number'].includes(this.field.type) && this.field.default_value && this.$refs.textContainer && (this.textOverflowChars === 0 || (this.textOverflowChars - 4) > `${this.field.default_value}`.length)) {
-        this.textOverflowChars = this.$el.clientHeight < this.$refs.textContainer.clientHeight ? this.field.default_value.length : 0
+        this.textOverflowChars = this.$el.clientHeight < this.$refs.textContainer.clientHeight ? `${this.field.default_value}`.length : 0
-      })
+      }
-    }
+    })
   },
   methods: {
     buildDefaultName: Field.methods.buildDefaultName,
@@ -343,7 +352,7 @@ export default {
     },
     onResizeCell (e) {
       if (e.target.id === 'mask') {
-        const positionX = e.layerX / (e.target.clientWidth - 1)
+        const positionX = e.offsetX / (e.target.clientWidth - 1)
 
         if (positionX > this.area.x) {
           this.area.cell_w = positionX - this.area.x
@@ -389,16 +398,16 @@ export default {
     },
     resize (e) {
       if (e.target.id === 'mask') {
-        this.area.w = e.layerX / e.target.clientWidth - this.area.x
+        this.area.w = e.offsetX / e.target.clientWidth - this.area.x
-        this.area.h = e.layerY / e.target.clientHeight - this.area.y
+        this.area.h = e.offsetY / e.target.clientHeight - this.area.y
       }
     },
     drag (e) {
       if (e.target.id === 'mask') {
         this.isDragged = true
 
-        this.area.x = (e.layerX - this.dragFrom.x) / e.target.clientWidth
+        this.area.x = (e.offsetX - this.dragFrom.x) / e.target.clientWidth
-        this.area.y = (e.layerY - this.dragFrom.y) / e.target.clientHeight
+        this.area.y = (e.offsetY - this.dragFrom.y) / e.target.clientHeight
       }
     },
     startDrag (e) {

app/javascript/template_builder/builder.vue

@@ -94,11 +94,13 @@
       </div>
     </div>
     <div
+      id="main_container"
       class="flex"
       :class="$slots.buttons || withTitle ? 'md:max-h-[calc(100%_-_60px)]' : 'md:max-h-[100%]'"
     >
       <div
         v-if="withDocumentsList"
+        id="documents_container"
         ref="previews"
         :style="{ 'display': isBreakpointLg ? 'none' : 'initial' }"
         class="overflow-y-auto overflow-x-hidden w-52 flex-none pr-3 mt-0.5 pt-0.5 hidden lg:block"
@@ -134,7 +136,10 @@
           />
         </div>
       </div>
-      <div class="w-full overflow-y-hidden md:overflow-y-auto overflow-x-hidden mt-0.5 pt-0.5">
+      <div
+        id="pages_container"
+        class="w-full overflow-y-hidden md:overflow-y-auto overflow-x-hidden mt-0.5 pt-0.5"
+      >
         <div
           ref="documents"
           class="pr-3.5 pl-0.5"
@@ -161,9 +166,10 @@
                 :allow-draw="!onlyDefinedFields"
                 :default-submitters="defaultSubmitters"
                 :draw-field="drawField"
+                :draw-field-type="drawFieldType"
                 :editable="editable"
                 :base-url="baseUrl"
-                @draw="onDraw"
+                @draw="[onDraw($event), withSelectedFieldType ? '' : drawFieldType = '', showDrawField = false]"
                 @drop-field="onDropfield"
                 @remove-area="removeArea"
               />
@@ -200,17 +206,18 @@
       </div>
       <div
         v-if="withFieldsList"
+        id="fields_list_container"
         class="relative w-80 flex-none mt-1 pr-4 pl-0.5 hidden md:block"
         :class="drawField ? 'overflow-hidden' : 'overflow-y-auto overflow-x-hidden'"
       >
         <div
-          v-if="drawField"
+          v-if="showDrawField || drawField"
           class="sticky inset-0 h-full z-20"
           :style="{ backgroundColor }"
         >
-          <div class="bg-base-300 rounded-lg p-5 text-center space-y-4">
+          <div class="bg-base-200 rounded-lg p-5 text-center space-y-4">
             <p>
-              {{ t('draw_field_on_the_document').replace('{field}', drawField.name) }}
+              {{ t('draw_field_on_the_document').replace('{field}', drawField?.name || '') }}
             </p>
             <div>
               <button
@@ -220,10 +227,10 @@
                 {{ t('cancel') }}
               </button>
               <a
-                v-if="!drawOption && !drawField.areas.length && !['stamp', 'signature', 'initials'].includes(drawField.type)"
+                v-if="!drawField && !drawOption && !['stamp', 'signature', 'initials'].includes(drawField?.type || drawFieldType)"
                 href="#"
                 class="link block mt-3 text-sm"
-                @click.prevent="[drawField = null, drawOption = null]"
+                @click.prevent="[addField(drawFieldType), drawField = null, drawOption = null, withSelectedFieldType ? '' : drawFieldType = '', showDrawField = false]"
               >
                 {{ t('or_add_field_without_drawing') }}
               </a>
@@ -238,12 +245,15 @@
             :selected-submitter="selectedSubmitter"
             :with-help="withHelp"
             :default-submitters="defaultSubmitters"
+            :draw-field-type="drawFieldType"
             :default-fields="defaultFields"
             :field-types="fieldTypes"
             :with-sticky-submitters="withStickySubmitters"
             :only-defined-fields="onlyDefinedFields"
             :editable="editable"
+            @add-field="addField"
             @set-draw="[drawField = $event.field, drawOption = $event.option]"
+            @set-draw-type="[drawFieldType = $event, showDrawField = true]"
             @set-drag="dragField = $event"
             @change-submitter="selectedSubmitter = $event"
             @drag-end="dragField = null"
@@ -322,6 +332,7 @@ export default {
       backgroundColor: this.backgroundColor,
       withPhone: this.withPhone,
       withPayment: this.withPayment,
+      isPaymentConnected: this.isPaymentConnected,
       withFormula: this.withFormula,
       withConditions: this.withConditions,
       defaultDrawFieldType: this.defaultDrawFieldType,
@@ -369,6 +380,11 @@ export default {
       required: false,
       default: () => []
     },
+    withSelectedFieldType: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     defaultDrawFieldType: {
       type: String,
       required: false,
@@ -438,6 +454,11 @@ export default {
       required: false,
       default: true
     },
+    authenticityToken: {
+      type: String,
+      required: false,
+      default: ''
+    },
     withDocumentsList: {
       type: Boolean,
       required: false,
@@ -453,6 +474,11 @@ export default {
       required: false,
       default: false
     },
+    isPaymentConnected: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withFormula: {
       type: Boolean,
       required: false,
@@ -480,7 +506,9 @@ export default {
       isBreakpointLg: false,
       isSaving: false,
       selectedSubmitter: null,
+      showDrawField: false,
       drawField: null,
+      drawFieldType: null,
       drawOption: null,
       dragField: null
     }
@@ -523,7 +551,7 @@ export default {
       submitter.name = name
 
       if (existingSubmittersUuids.filter(Boolean).length) {
-        submitter.uuid = existingSubmittersUuids[index] || v4()
+        submitter.uuid = existingSubmittersUuids[index] || submitter.uuid || v4()
       } else {
         submitter.uuid ||= v4()
       }
@@ -563,6 +591,34 @@ export default {
     t (key) {
       return this.i18n[key] || i18nEn[key] || key
     },
+    addField (type, area = null) {
+      const field = {
+        name: '',
+        uuid: v4(),
+        required: type !== 'checkbox',
+        areas: area ? [area] : [],
+        submitter_uuid: this.selectedSubmitter.uuid,
+        type
+      }
+
+      if (['select', 'multiple', 'radio'].includes(type)) {
+        field.options = [{ value: '', uuid: v4() }]
+      }
+
+      if (type === 'stamp') {
+        field.readonly = true
+      }
+
+      if (type === 'date') {
+        field.preferences = {
+          format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+        }
+      }
+
+      this.template.fields.push(field)
+
+      this.save()
+    },
     startFieldDraw ({ name, type }) {
       const existingField = this.template.fields?.find((f) => f.submitter_uuid === this.selectedSubmitter.uuid && name && name === f.name)
 
@@ -643,15 +699,13 @@ export default {
       ref.$el.scrollIntoView({ behavior: 'smooth', block: 'start' })
     },
     clearDrawField () {
-      if (this.drawField && !this.drawOption && this.drawField.areas.length === 0) {
-        const fieldIndex = this.template.fields.indexOf(this.drawField)
-
-        if (fieldIndex !== -1) {
-          this.template.fields.splice(fieldIndex, 1)
-        }
-      }
       this.drawField = null
       this.drawOption = null
+      this.showDrawField = false
+
+      if (!this.withSelectedFieldType) {
+        this.drawFieldType = ''
+      }
     },
     onKeyUp (e) {
       if (e.code === 'Escape') {
@@ -701,6 +755,27 @@ export default {
         }
       }
     },
+    setDefaultAreaSize (area, type) {
+      const documentRef = this.documentRefs.find((e) => e.document.uuid === area.attachment_uuid)
+      const pageMask = documentRef.pageRefs[area.page].$refs.mask
+
+      if (type === 'checkbox') {
+        area.w = pageMask.clientWidth / 30 / pageMask.clientWidth
+        area.h = (pageMask.clientWidth / 30 / pageMask.clientWidth) * (pageMask.clientWidth / pageMask.clientHeight)
+      } else if (type === 'image') {
+        area.w = pageMask.clientWidth / 5 / pageMask.clientWidth
+        area.h = (pageMask.clientWidth / 5 / pageMask.clientWidth) * (pageMask.clientWidth / pageMask.clientHeight)
+      } else if (type === 'signature' || type === 'stamp') {
+        area.w = pageMask.clientWidth / 5 / pageMask.clientWidth
+        area.h = (pageMask.clientWidth / 5 / pageMask.clientWidth) * (pageMask.clientWidth / pageMask.clientHeight) / 2
+      } else if (type === 'initials') {
+        area.w = pageMask.clientWidth / 10 / pageMask.clientWidth
+        area.h = (pageMask.clientWidth / 35 / pageMask.clientWidth)
+      } else {
+        area.w = pageMask.clientWidth / 5 / pageMask.clientWidth
+        area.h = (pageMask.clientWidth / 35 / pageMask.clientWidth)
+      }
+    },
     onDraw (area) {
       if (this.drawField) {
         if (this.drawOption) {
@@ -723,25 +798,7 @@ export default {
             area.w = previousArea.w
             area.h = previousArea.h
           } else {
-            const documentRef = this.documentRefs.find((e) => e.document.uuid === area.attachment_uuid)
+            this.setDefaultAreaSize(area, this.drawOption ? 'checkbox' : this.drawField?.type)
-            const pageMask = documentRef.pageRefs[area.page].$refs.mask
-
-            if (this.drawField.type === 'checkbox' || this.drawOption) {
-              area.w = pageMask.clientWidth / 30 / pageMask.clientWidth
-              area.h = (pageMask.clientWidth / 30 / pageMask.clientWidth) * (pageMask.clientWidth / pageMask.clientHeight)
-            } else if (this.drawField.type === 'image') {
-              area.w = pageMask.clientWidth / 5 / pageMask.clientWidth
-              area.h = (pageMask.clientWidth / 5 / pageMask.clientWidth) * (pageMask.clientWidth / pageMask.clientHeight)
-            } else if (this.drawField.type === 'signature' || this.drawField.type === 'stamp') {
-              area.w = pageMask.clientWidth / 5 / pageMask.clientWidth
-              area.h = (pageMask.clientWidth / 5 / pageMask.clientWidth) * (pageMask.clientWidth / pageMask.clientHeight) / 2
-            } else if (this.drawField.type === 'initials') {
-              area.w = pageMask.clientWidth / 10 / pageMask.clientWidth
-              area.h = (pageMask.clientWidth / 35 / pageMask.clientWidth)
-            } else {
-              area.w = pageMask.clientWidth / 5 / pageMask.clientWidth
-              area.h = (pageMask.clientWidth / 35 / pageMask.clientWidth)
-            }
           }
 
           area.x -= area.w / 2
@@ -776,13 +833,15 @@ export default {
 
         let type = (pageMask.clientWidth * area.w) < 35 ? 'checkbox' : 'text'
 
-        if (this.defaultDrawFieldType && this.defaultDrawFieldType !== 'text') {
+        if (this.drawFieldType) {
+          type = this.drawFieldType
+        } else if (this.defaultDrawFieldType && this.defaultDrawFieldType !== 'text') {
           type = this.defaultDrawFieldType
         } else if (this.fieldTypes.length !== 0 && !this.fieldTypes.includes(type)) {
           type = this.fieldTypes[0]
         }
 
-        if (type === 'checkbox') {
+        if (type === 'checkbox' && !this.drawFieldType) {
           const previousField = [...this.template.fields].reverse().find((f) => f.type === type)
           const previousArea = previousField?.areas?.[previousField.areas.length - 1]
 
@@ -800,21 +859,22 @@ export default {
           }
         }
 
-        if (area.w) {
+        if (this.drawFieldType && (area.w === 0 || area.h === 0)) {
-          const field = {
+          if (this.selectedField?.type === this.drawFieldType) {
-            name: '',
+            area.w = this.selectedAreaRef.value.w
-            uuid: v4(),
+            area.h = this.selectedAreaRef.value.h
-            required: type !== 'checkbox',
+          } else {
-            type,
+            this.setDefaultAreaSize(area, this.drawFieldType)
-            submitter_uuid: this.selectedSubmitter.uuid,
-            areas: [area]
           }
 
-          this.template.fields.push(field)
+          area.x -= area.w / 2
+          area.y -= area.h / 2
+        }
+
+        if (area.w) {
+          this.addField(type, area)
 
           this.selectedAreaRef.value = area
-
-          this.save()
         }
       }
     },
@@ -945,14 +1005,21 @@ export default {
         this.template.schema.splice(this.template.schema.indexOf(item), 1)
       }
 
+      const removedFieldUuids = []
+
       this.template.fields.forEach((field) => {
         [...(field.areas || [])].forEach((area) => {
           if (area.attachment_uuid === item.attachment_uuid) {
             field.areas.splice(field.areas.indexOf(area), 1)
+
+            removedFieldUuids.push(field.uuid)
           }
         })
       })
 
+      this.template.fields =
+        this.template.fields.filter((f) => !removedFieldUuids.includes(f.uuid) || f.areas?.length)
+
       this.save()
     },
     onDocumentReplace ({ replaceSchemaItem, schema, documents }) {
@@ -1017,7 +1084,11 @@ export default {
     baseFetch (path, options = {}) {
       return fetch(this.baseUrl + path, {
         ...options,
-        headers: { ...this.fetchOptions.headers, ...options.headers }
+        headers: {
+          'X-CSRF-Token': this.authenticityToken,
+          ...this.fetchOptions.headers,
+          ...options.headers
+        }
       })
     },
     save ({ force } = { force: false }) {
@@ -1033,7 +1104,7 @@ export default {
 
       this.pushUndo()
 
-      return this.baseFetch(`/api/templates/${this.template.id}`, {
+      return this.baseFetch(`/templates/${this.template.id}`, {
         method: 'PUT',
         body: JSON.stringify({
           template: {

app/javascript/template_builder/description_modal.vue

@@ -0,0 +1,107 @@
+<template>
+  <div
+    class="modal modal-open items-start !animate-none overflow-y-auto"
+  >
+    <div
+      class="absolute top-0 bottom-0 right-0 left-0"
+      @click.prevent="$emit('close')"
+    />
+    <div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none w-full max-w-xl">
+      <div class="flex justify-between items-center border-b pb-2 mb-2 font-medium">
+        <span>
+          {{ field.name || buildDefaultName(field, template.fields) }}
+        </span>
+        <a
+          href="#"
+          class="text-xl"
+          @click.prevent="$emit('close')"
+        >&times;</a>
+      </div>
+      <div>
+        <form @submit.prevent="saveAndClose">
+          <div class="space-y-1 mb-1">
+            <div>
+              <label
+                dir="auto"
+                class="label text-sm"
+                for="description_field"
+              >
+                {{ t('description') }}
+              </label>
+              <textarea
+                id="description_field"
+                ref="textarea"
+                v-model="description"
+                dir="auto"
+                class="base-textarea !text-base w-full"
+                @input="resizeTextarea"
+              />
+            </div>
+            <div>
+              <label
+                dir="auto"
+                class="label text-sm"
+                for="title_field"
+              >
+                {{ t('display_title') }} ({{ t('optional') }})
+              </label>
+              <input
+                id="title_field"
+                v-model="title"
+                dir="auto"
+                class="base-input !text-base w-full"
+              >
+            </div>
+          </div>
+          <button
+            class="base-button w-full mt-4"
+          >
+            {{ t('save') }}
+          </button>
+        </form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DescriptionModal',
+  inject: ['t', 'save', 'template'],
+  props: {
+    field: {
+      type: Object,
+      required: true
+    },
+    buildDefaultName: {
+      type: Function,
+      required: true
+    }
+  },
+  emits: ['close'],
+  data () {
+    return {
+      description: this.field.description,
+      title: this.field.title
+    }
+  },
+  mounted () {
+    this.resizeTextarea()
+  },
+  methods: {
+    saveAndClose () {
+      this.field.description = this.description
+      this.field.title = this.title
+
+      this.save()
+      this.$emit('close')
+    },
+    resizeTextarea () {
+      const textarea = this.$refs.textarea
+
+      textarea.style.height = 'auto'
+      textarea.style.height = textarea.scrollHeight + 'px'
+    }
+  }
+}
+</script>

app/javascript/template_builder/document.vue

@@ -12,6 +12,7 @@
       :default-fields="defaultFields"
       :default-submitters="defaultSubmitters"
       :draw-field="drawField"
+      :draw-field-type="drawFieldType"
       :selected-submitter="selectedSubmitter"
       :image="image"
       @drop-field="$emit('drop-field', {...$event, attachment_uuid: document.uuid })"
@@ -43,6 +44,11 @@ export default {
       required: false,
       default: () => []
     },
+    drawFieldType: {
+      type: String,
+      required: false,
+      default: ''
+    },
     defaultSubmitters: {
       type: Array,
       required: false,

app/javascript/template_builder/dropzone.vue

@@ -5,7 +5,7 @@
     @drop.prevent="onDropFiles"
   >
     <label
-      class="w-full relative bg-base-200 hover:bg-base-200/70 rounded-md border border-base-content border-dashed"
+      class="w-full relative hover:bg-base-200/30 rounded-md border border-2 border-base-content/10 border-dashed"
       :for="inputId"
       :class="{ 'opacity-50': isLoading || isProcessing }"
     >

app/javascript/template_builder/field.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    class="group pb-2"
+    class="list-field group mb-2"
   >
     <div
       class="border border-base-300 rounded rounded-tr-none relative group"
@@ -116,15 +116,41 @@
               @click="closeDropdown"
             >
               <div
-                v-if="field.type === 'text' && !defaultField"
+                v-if="['number'].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"
+                  @change="[field.preferences ||= {}, field.preferences.align = $event.target.value, save()]"
+                >
+                  <option
+                    v-for="value in ['left', 'right', 'center']"
+                    :key="value"
+                    :selected="field.preferences?.align ? value === field.preferences.align : value === 'left'"
+                    :value="value"
+                  >
+                    {{ t(value) }}
+                  </option>
+                </select>
+                <label
+                  :style="{ backgroundColor: backgroundColor }"
+                  class="absolute -top-1 left-2.5 px-1 h-4"
+                  style="font-size: 8px"
+                >
+                  {{ t('align') }}
+                </label>
+              </div>
+              <div
+                v-if="['text', 'number'].includes(field.type) && !defaultField"
                 class="py-1.5 px-1 relative"
                 @click.stop
               >
                 <input
                   v-model="field.default_value"
-                  type="text"
                   :placeholder="t('default_value')"
                   dir="auto"
+                  :type="field.type"
                   class="input input-bordered input-xs w-full max-w-xs h-7 !outline-0"
                   @blur="save"
                 >
@@ -202,7 +228,7 @@
                 </label>
               </div>
               <li
-                v-if="field.type != 'phone'"
+                v-if="field.type != 'phone' && field.type != 'stamp'"
                 @click.stop
               >
                 <label class="cursor-pointer py-1.5">
@@ -215,6 +241,20 @@
                   <span class="label-text">{{ t('required') }}</span>
                 </label>
               </li>
+              <li
+                v-if="field.type == 'stamp'"
+                @click.stop
+              >
+                <label class="cursor-pointer py-1.5">
+                  <input
+                    :checked="field.preferences?.with_logo != false"
+                    type="checkbox"
+                    class="toggle toggle-xs"
+                    @change="[field.preferences ||= {}, field.preferences.with_logo = field.preferences.with_logo == false, save()]"
+                  >
+                  <span class="label-text">{{ t('with_logo') }}</span>
+                </label>
+              </li>
               <li
                 v-if="field.type == 'checkbox'"
                 @click.stop
@@ -244,7 +284,7 @@
                 </label>
               </li>
               <li
-                v-if="field.type === 'text' && !defaultField"
+                v-if="['text', 'number'].includes(field.type) && !defaultField"
                 @click.stop
               >
                 <label class="cursor-pointer py-1.5">
@@ -257,8 +297,28 @@
                   <span class="label-text">{{ t('read_only') }}</span>
                 </label>
               </li>
-              <hr class="pb-0.5 mt-0.5">
+              <hr
-              <li>
+                v-if="field.type != 'stamp'"
+                class="pb-0.5 mt-0.5"
+              >
+              <li
+                v-if="field.type != 'stamp'"
+              >
+                <label
+                  class="label-text cursor-pointer text-center w-full flex items-center"
+                  @click="isShowDescriptionModal = !isShowDescriptionModal"
+                >
+                  <IconInfoCircle
+                    width="18"
+                  />
+                  <span class="text-sm">
+                    {{ t('description') }}
+                  </span>
+                </label>
+              </li>
+              <li
+                v-if="field.type != 'stamp'"
+              >
                 <label
                   class="label-text cursor-pointer text-center w-full flex items-center"
                   @click="isShowConditionsModal = !isShowConditionsModal"
@@ -286,7 +346,7 @@
               </li>
               <hr class="pb-0.5 mt-0.5">
               <li
-                v-for="(area, index) in field.areas || []"
+                v-for="(area, index) in sortedAreas"
                 :key="index"
               >
                 <a
@@ -435,6 +495,16 @@
         @close="isShowConditionsModal = false"
       />
     </Teleport>
+    <Teleport
+      v-if="isShowDescriptionModal"
+      :to="modalContainerEl"
+    >
+      <DescriptionModal
+        :field="field"
+        :build-default-name="buildDefaultName"
+        @close="isShowDescriptionModal = false"
+      />
+    </Teleport>
   </div>
 </template>
 
@@ -444,7 +514,8 @@ import FieldType from './field_type'
 import PaymentSettings from './payment_settings'
 import FormulaModal from './formula_modal'
 import ConditionsModal from './conditions_modal'
-import { IconRouteAltLeft, IconMathFunction, IconShape, IconNewSection, IconTrashX, IconCopy, IconSettings } from '@tabler/icons-vue'
+import DescriptionModal from './description_modal'
+import { IconInfoCircle, IconRouteAltLeft, IconMathFunction, IconShape, IconNewSection, IconTrashX, IconCopy, IconSettings } from '@tabler/icons-vue'
 import { v4 } from 'uuid'
 
 export default {
@@ -455,7 +526,9 @@ export default {
     IconShape,
     PaymentSettings,
     IconNewSection,
+    IconInfoCircle,
     FormulaModal,
+    DescriptionModal,
     ConditionsModal,
     IconRouteAltLeft,
     IconTrashX,
@@ -487,11 +560,24 @@ export default {
       showPaymentModal: false,
       isShowFormulaModal: false,
       isShowConditionsModal: false,
+      isShowDescriptionModal: false,
       renderDropdown: false
     }
   },
   computed: {
     fieldNames: FieldType.computed.fieldNames,
+    schemaAttachmentsIndexes () {
+      return (this.template.schema || []).reduce((acc, item, index) => {
+        acc[item.attachment_uuid] = index
+
+        return acc
+      }, {})
+    },
+    sortedAreas () {
+      return (this.field.areas || []).sort((a, b) => {
+        return this.schemaAttachmentsIndexes[a.attachment_uuid] - this.schemaAttachmentsIndexes[b.attachment_uuid]
+      })
+    },
     modalContainerEl () {
       return this.$el.getRootNode().querySelector('#docuseal_modal_container')
     },
@@ -607,7 +693,7 @@ export default {
       }
     },
     scrollToFirstArea () {
-      return this.field.areas?.[0] && this.$emit('scroll-to', this.field.areas[0])
+      return this.sortedAreas[0] && this.$emit('scroll-to', this.sortedAreas[0])
     },
     closeDropdown () {
       document.activeElement.blur()
@@ -625,7 +711,12 @@ export default {
     },
     removeOption (option) {
       this.field.options.splice(this.field.options.indexOf(option), 1)
-      this.field.areas.splice(this.field.areas.findIndex((a) => a.option_uuid === option.uuid), 1)
+
+      const optionIndex = this.field.areas.findIndex((a) => a.option_uuid === option.uuid)
+
+      if (optionIndex !== -1) {
+        this.field.areas.splice(this.field.areas.findIndex((a) => a.option_uuid === option.uuid), 1)
+      }
 
       this.save()
     },

app/javascript/template_builder/fields.vue

@@ -2,7 +2,7 @@
   <div :class="withStickySubmitters ? 'sticky top-0 z-10' : ''">
     <FieldSubmitter
       :model-value="selectedSubmitter.uuid"
-      class="w-full rounded-lg"
+      class="roles-dropdown w-full rounded-lg"
       :class="{ 'bg-base-100': withStickySubmitters }"
       :submitters="submitters"
       :editable="editable && !defaultSubmitters.length"
@@ -14,7 +14,7 @@
   </div>
   <div
     ref="fields"
-    class="mb-1 mt-2"
+    class="fields mb-1 mt-2"
     @dragover.prevent="onFieldDragover"
     @drop="reorderFields"
   >
@@ -36,32 +36,63 @@
   </div>
   <div v-if="submitterDefaultFields.length">
     <hr class="mb-2">
-    <template
+    <template v-if="isShowFieldSearch">
-      v-for="field in submitterDefaultFields"
+      <input
-      :key="field.name"
+        v-model="defaultFieldsSearch"
+        :placeholder="t('search_field')"
+        class="input input-ghost input-xs px-0 text-base mb-2 !outline-0 !rounded bg-transparent w-full"
+      >
+      <hr class="mb-2">
+    </template>
+    <div
+      class="overflow-auto relative"
+      :style="{
+        maxHeight: isShowFieldSearch ? '210px' : '',
+        minHeight: isShowFieldSearch ? '210px' : ''
+      }"
     >
       <div
-        :style="{ backgroundColor: backgroundColor }"
+        v-if="!filteredSubmitterDefaultFields.length && defaultFieldsSearch"
-        draggable="true"
+        class="top-0 bottom-0 text-center absolute flex items-center justify-center w-full flex-col"
-        class="border border-base-300 rounded rounded-tr-none relative group mb-2"
-        @dragstart="onDragstart({ type: 'text', ...field })"
-        @dragend="$emit('drag-end')"
       >
-        <div class="flex items-center justify-between relative cursor-grab">
+        <div>
-          <div class="flex items-center p-1 space-x-1">
+          {{ t('field_not_found') }}
-            <IconDrag />
+        </div>
-            <FieldType
+        <a
-              :model-value="field.type || 'text'"
+          href="#"
-              :editable="false"
+          class="link"
-              :button-width="20"
+          @click.prevent="defaultFieldsSearch = ''"
-            />
+        >
-            <span class="block pl-0.5">
+          {{ t('clear') }}
-              {{ field.name }}
+        </a>
-            </span>
+      </div>
+      <template
+        v-for="field in filteredSubmitterDefaultFields"
+        :key="field.name"
+      >
+        <div
+          :style="{ backgroundColor: backgroundColor }"
+          draggable="true"
+          class="default-field border border-base-300 rounded rounded-tr-none relative group mb-2"
+          @dragstart="onDragstart({ type: 'text', ...field })"
+          @dragend="$emit('drag-end')"
+        >
+          <div class="flex items-center justify-between relative cursor-grab">
+            <div class="flex items-center p-1 space-x-1">
+              <IconDrag />
+              <FieldType
+                :model-value="field.type || 'text'"
+                :editable="false"
+                :button-width="20"
+              />
+              <span class="block pl-0.5">
+                {{ field.name }}
+              </span>
+            </div>
           </div>
         </div>
-      </div>
+      </template>
-    </template>
+    </div>
   </div>
   <div
     v-if="editable && !onlyDefinedFields"
@@ -74,14 +105,18 @@
       <button
         v-if="(fieldTypes.length === 0 || fieldTypes.includes(type)) && (withPhone || type != 'phone') && (withPayment || type != 'payment')"
         draggable="true"
-        class="group flex items-center justify-center border border-dashed border-base-300 hover:border-base-content/20 w-full rounded relative"
+        class="field-type-button group flex items-center justify-center border border-dashed w-full rounded relative"
         :style="{ backgroundColor: backgroundColor }"
+        :class="drawFieldType === type ? 'border-base-content/40' : 'border-base-300 hover:border-base-content/20'"
         @dragstart="onDragstart({ type: type })"
         @dragend="$emit('drag-end')"
-        @click="addField(type)"
+        @click="['file', 'payment'].includes(type) ? $emit('add-field', type) : $emit('set-draw-type', type)"
       >
-        <div class="flex items-console group-hover:bg-base-200/50 transition-all cursor-grab h-full absolute left-0">
+        <div
-          <IconDrag class=" my-auto" />
+          class="flex items-console transition-all cursor-grab h-full absolute left-0"
+          :class="drawFieldType === type ? 'bg-base-200/50' : 'group-hover:bg-base-200/50'"
+        >
+          <IconDrag class="my-auto" />
         </div>
         <div class="flex items-center flex-col px-2 py-2">
           <component :is="icon" />
@@ -139,10 +174,9 @@
 
 <script>
 import Field from './field'
-import { v4 } from 'uuid'
 import FieldType from './field_type'
 import FieldSubmitter from './field_submitter'
-import { IconLock } from '@tabler/icons-vue'
+import { IconLock, IconCirclePlus } from '@tabler/icons-vue'
 import IconDrag from './icon_drag'
 
 export default {
@@ -150,6 +184,7 @@ export default {
   components: {
     Field,
     FieldType,
+    IconCirclePlus,
     FieldSubmitter,
     IconDrag,
     IconLock
@@ -180,6 +215,11 @@ export default {
       required: false,
       default: true
     },
+    drawFieldType: {
+      type: String,
+      required: false,
+      default: ''
+    },
     defaultSubmitters: {
       type: Array,
       required: false,
@@ -204,10 +244,18 @@ export default {
       required: true
     }
   },
-  emits: ['set-draw', 'set-drag', 'drag-end', 'scroll-to-area', 'change-submitter'],
+  emits: ['add-field', 'set-draw', 'set-draw-type', 'set-drag', 'drag-end', 'scroll-to-area', 'change-submitter'],
+  data () {
+    return {
+      defaultFieldsSearch: ''
+    }
+  },
   computed: {
     fieldNames: FieldType.computed.fieldNames,
     fieldIcons: FieldType.computed.fieldIcons,
+    isShowFieldSearch () {
+      return this.submitterDefaultFields.length > 15
+    },
     fieldIconsSorted () {
       if (this.fieldTypes.length) {
         return this.fieldTypes.reduce((acc, type) => {
@@ -226,6 +274,13 @@ export default {
       return this.defaultFields.filter((f) => {
         return !this.submitterFields.find((field) => field.name === f.name) && (!f.role || f.role === this.selectedSubmitter.name)
       })
+    },
+    filteredSubmitterDefaultFields () {
+      if (this.defaultFieldsSearch) {
+        return this.submitterDefaultFields.filter((f) => f.name.toLowerCase().includes(this.defaultFieldsSearch.toLowerCase()))
+      } else {
+        return this.submitterDefaultFields
+      }
     }
   },
   methods: {
@@ -286,38 +341,6 @@ export default {
         })
       })
 
-      this.save()
-    },
-    addField (type, area = null) {
-      const field = {
-        name: '',
-        uuid: v4(),
-        required: type !== 'checkbox',
-        areas: [],
-        submitter_uuid: this.selectedSubmitter.uuid,
-        type
-      }
-
-      if (['select', 'multiple', 'radio'].includes(type)) {
-        field.options = [{ value: '', uuid: v4() }]
-      }
-
-      if (type === 'stamp') {
-        field.readonly = true
-      }
-
-      if (type === 'date') {
-        field.preferences = {
-          format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
-        }
-      }
-
-      this.fields.push(field)
-
-      if (!['payment', 'file'].includes(type)) {
-        this.$emit('set-draw', { field })
-      }
-
       this.save()
     }
   }

app/javascript/template_builder/i18n.js

@@ -1,4 +1,14 @@
 const en = {
+  search_field: 'Search field',
+  field_not_found: 'Field not found',
+  clear: 'Clear',
+  align: 'Align',
+  left: 'Left',
+  right: 'Right',
+  center: 'Center',
+  description: 'Description',
+  display_title: 'Display title',
+  with_logo: 'With logo',
   unchecked: 'Unchecked',
   equal: 'Equal',
   not_equal: 'Not equal',

app/javascript/template_builder/import_list.vue

@@ -0,0 +1,383 @@
+<template>
+  <div>
+    <div v-if="selectedSheetIndex === null && spreadsheet">
+      <form @submit.prevent="[selectedSheetIndex = $refs.selectWorksheet.value, buildDefaultMappings()]">
+        <label class="label">
+          Select Worksheet
+        </label>
+        <select
+          ref="selectWorksheet"
+          class="base-select"
+        >
+          <option
+            v-for="(sheet, index) in spreadsheet"
+            :key="index"
+            :value="index"
+          >
+            {{ sheet[0] || index }}
+          </option>
+        </select>
+        <button class="base-button mt-4 w-full">
+          Open
+        </button>
+      </form>
+    </div>
+    <div v-else-if="selectedSheetIndex !== null">
+      <div
+        v-for="submitter in submitters"
+        :key="submitter.uuid"
+        class="mb-4"
+      >
+        <div
+          v-if="submitters.length > 1"
+          class="px-3 border-y py-2 border-base-300 text-center w-full"
+        >
+          {{ submitter.name }}
+        </div>
+        <div class="flex">
+          <div class="relative w-full py-2 px-2 text-sm">
+            Recipient field
+          </div>
+          <div class="relative w-full py-2 pl-4 text-sm">
+            Spreadsheet column
+          </div>
+        </div>
+        <div
+          v-for="mapping in mappings.filter((m) => m.submitter_uuid === submitter.uuid)"
+          :key="mapping.uuid"
+          class="mb-2"
+        >
+          <div class="flex">
+            <select
+              class="base-select !select-sm !h-10"
+              required
+              @change="mapping.field_name = $event.target.value"
+            >
+              <option
+                disabled
+                value=""
+                :selected="!mapping.field_name"
+              >
+                Select Field
+              </option>
+              <option
+                v-for="(field, index) in selectFieldsForSubmitter(submitter)"
+                :key="index"
+                :value="field.name"
+                :selected="mapping.field_name === field.name"
+              >
+                {{ field.name }}
+              </option>
+            </select>
+            <div class="flex items-center px-1">
+              <IconArrowsHorizontal style="width: 19px; height: 19px" />
+            </div>
+            <div class="w-full relative">
+              <select
+                class="base-select !select-sm !h-10"
+                required
+                @change="mapping.column_index = parseInt($event.target.value)"
+              >
+                <option
+                  disabled
+                  value=""
+                  :selected="mapping.column_index == null"
+                >
+                  Select Column
+                </option>
+                <template
+                  v-for="(column, index) in columns"
+                  :key="index"
+                >
+                  <option
+                    v-if="column"
+                    :value="index"
+                    :selected="index === mapping.column_index"
+                  >
+                    {{ column }}
+                  </option>
+                </template>
+              </select>
+              <div
+                v-if="mapping.column_index != null"
+                class="absolute top-0 bottom-0 right-1 flex items-center"
+              >
+                <span
+                  class="tooltip tooltip-bottom-end pr-1 tooltip-pre"
+                  style="padding-top: 2px"
+                  :data-tip="[0, 1, 2].map((i) => rows[i]?.[mapping.column_index] ?? '---').join('\n')"
+                >
+                  <button
+                    class="btn btn-xs btn-circle bg-white border-0 border-gray-300"
+                    @click.prevent
+                  >
+                    <IconInfoCircle class="h-4 w-4" />
+                  </button>
+                </span>
+              </div>
+            </div>
+            <div class="flex items-center pl-1">
+              <span
+                class="tooltip tooltip-top"
+                data-tip="Remove"
+              >
+                <button
+                  :disabled="mappings.filter((m) => m.submitter_uuid === submitter.uuid).length < 2"
+                  class="btn btn-xs btn-circle"
+                  @click.prevent="mappings.splice(mappings.indexOf(mapping), 1)"
+                >
+                  <IconX class="h-3.5 w-3.5" />
+                </button>
+              </span>
+            </div>
+          </div>
+        </div>
+        <div>
+          <button
+            class="btn btn-sm btn-primary w-full !normal-case font-medium"
+            @click.prevent="addMapping(submitter)"
+          >
+            <IconPlus class="w-4 h-4" />
+            New Field Mapping
+          </button>
+        </div>
+      </div>
+      <div>
+        <input
+          name="submissions_json"
+          hidden
+          :value="JSON.stringify(submissionsData.slice(0, 1100))"
+        >
+      </div>
+      <div
+        class="px-3 border-y py-2 border-base-300 text-center w-full text-sm font-semibold"
+      >
+        Total entries: {{ submissionsData.length }}
+        <template v-if="submissionsData.length >= 1000">
+          / 1000
+        </template>
+      </div>
+    </div>
+    <div
+      v-else
+      class="flex h-52 w-full"
+      @dragover.prevent
+      @drop.prevent="onDropFiles"
+    >
+      <label
+        class="w-full relative hover:bg-base-200/30 rounded-md border border-2 border-base-content/10 border-dashed"
+        for="import_list_file"
+        :class="{ 'opacity-50': isLoading }"
+      >
+        <div class="absolute top-0 right-0 left-0 bottom-0 flex items-center justify-center">
+          <div class="flex flex-col items-center">
+            <IconInnerShadowTop
+              v-if="isLoading"
+              class="animate-spin"
+              :width="40"
+              :height="40"
+            />
+            <IconCloudUpload
+              v-else
+              :width="40"
+              :height="40"
+            />
+            <div
+              class="font-medium text-lg mb-1"
+            >
+              Upload CSV or XLSX Spreadsheet
+            </div>
+            <div class="text-sm">
+              <span class="font-medium">Click to Upload</span> or drag and drop files.
+            </div>
+          </div>
+        </div>
+        <form
+          ref="form"
+          class="hidden"
+        >
+          <input
+            id="import_list_file"
+            ref="input"
+            type="file"
+            name="file"
+            accept=".xlsx, .xls, .csv"
+            @change="onSelectFile"
+          >
+        </form>
+      </label>
+    </div>
+  </div>
+</template>
+
+<script>
+import { IconCloudUpload, IconX, IconPlus, IconArrowsHorizontal, IconInfoCircle, IconInnerShadowTop } from '@tabler/icons-vue'
+import { v4 } from 'uuid'
+
+export default {
+  name: 'FileDropzone',
+  components: {
+    IconCloudUpload,
+    IconX,
+    IconArrowsHorizontal,
+    IconPlus,
+    IconInfoCircle,
+    IconInnerShadowTop
+  },
+  props: {
+    template: {
+      type: Object,
+      required: true
+    },
+    authenticityToken: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      isLoading: false,
+      spreadsheet: null,
+      selectedSheetIndex: null,
+      mappings: []
+    }
+  },
+  computed: {
+    table () {
+      return this.spreadsheet[this.selectedSheetIndex][1]
+    },
+    submissionsData () {
+      const submissions = []
+
+      this.rows.forEach((row) => {
+        const submittersIndex = {}
+
+        this.mappings.forEach((mapping) => {
+          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())) {
+              submittersIndex[mapping.submitter_uuid][mapping.field_name.toLowerCase()] = row[mapping.column_index]
+            } else {
+              submittersIndex[mapping.submitter_uuid].fields.push({
+                name: mapping.field_name, default_value: row[mapping.column_index], readonly: true
+              })
+            }
+          }
+        })
+
+        if (Object.keys(submittersIndex).length !== 0) {
+          submissions.push({ submitters: Object.values(submittersIndex) })
+        }
+      })
+
+      return submissions
+    },
+    submitters () {
+      return this.template.submitters
+    },
+    columns () {
+      return this.table[0]
+    },
+    form () {
+      return this.$el.closest('form')
+    },
+    fieldTypes () {
+      return ['text', 'cells', 'date', 'number', 'radio', 'select', 'checkbox']
+    },
+    defaultFields () {
+      return [
+        { name: 'Name' },
+        { name: 'Email' },
+        { name: 'Phone' }
+      ]
+    },
+    rows () {
+      return this.table.slice(1)
+    }
+  },
+  watch: {
+    selectedSheetIndex (value) {
+      if (value !== null) {
+        document.getElementById('list_form_buttons')?.classList?.remove('hidden')
+      }
+    }
+  },
+  methods: {
+    onDropFiles (e) {
+      this.uploadFile(e.dataTransfer.files[0])
+    },
+    onSelectFile (e) {
+      this.uploadFile(e.target.files[0])
+    },
+    addMapping (submitter) {
+      this.mappings.push({ uuid: v4(), field_name: '', column_index: null, submitter_uuid: submitter.uuid })
+    },
+    selectFieldsForSubmitter (submitter) {
+      const templateFields = this.template.fields.filter((field) => {
+        return field.submitter_uuid === submitter.uuid &&
+          field.name &&
+          this.fieldTypes.includes(field.type) &&
+          this.defaultFields.every((f) => field.name?.toLowerCase() !== f.name?.toLowerCase())
+      })
+
+      return [...this.defaultFields, ...templateFields]
+    },
+    buildDefaultMappings () {
+      this.submitters.forEach((submitter) => {
+        const fields = this.selectFieldsForSubmitter(submitter)
+
+        fields.forEach((field) => {
+          const columnIndex = this.columns.findIndex((column, index) => {
+            return column &&
+              column.toString().toLowerCase().includes(field.name?.toLowerCase()) &&
+              this.mappings.every((m) => m.column_index !== index)
+          })
+
+          if (columnIndex !== -1) {
+            this.mappings.push({ uuid: v4(), field_name: field.name, column_index: columnIndex, submitter_uuid: submitter.uuid })
+          }
+        })
+
+        if (!this.mappings.some((m) => m.field_name.toLowerCase() === 'name' && m.submitter_uuid === submitter.uuid)) {
+          this.mappings.unshift({ uuid: v4(), field_name: 'Name', submitter_uuid: submitter.uuid })
+        }
+
+        if (!this.mappings.some((m) => m.field_name.toLowerCase() === 'email' && m.submitter_uuid === submitter.uuid)) {
+          this.mappings.unshift({ uuid: v4(), field_name: 'Email', submitter_uuid: submitter.uuid })
+        }
+      })
+    },
+    uploadFile (file) {
+      this.isLoading = true
+
+      const formData = new FormData()
+
+      formData.append('file', file)
+
+      return fetch('/upload_spreadsheet', {
+        method: 'POST',
+        body: formData,
+        headers: {
+          'X-CSRF-Token': this.authenticityToken
+        }
+      }).then(resp => resp.json()).then((data) => {
+        if (data.error) {
+          return alert(data.error)
+        }
+
+        this.spreadsheet = data
+
+        if (data.length === 1) {
+          this.selectedSheetIndex = 0
+
+          this.buildDefaultMappings()
+        }
+      }).finally(() => {
+        this.isLoading = false
+      })
+    }
+  }
+}
+</script>

app/javascript/template_builder/page.vue

@@ -77,6 +77,11 @@ export default {
       required: false,
       default: () => []
     },
+    drawFieldType: {
+      type: String,
+      required: false,
+      default: ''
+    },
     allowDraw: {
       type: Boolean,
       required: false,
@@ -123,7 +128,9 @@ export default {
   },
   computed: {
     defaultFieldType () {
-      if (this.defaultDrawFieldType && this.defaultDrawFieldType !== 'text') {
+      if (this.drawFieldType) {
+        return this.drawFieldType
+      } else if (this.defaultDrawFieldType && this.defaultDrawFieldType !== 'text') {
         return this.defaultDrawFieldType
       } else if (this.fieldTypes.length !== 0 && !this.fieldTypes.includes('text')) {
         return this.fieldTypes[0]
@@ -162,8 +169,8 @@ export default {
     },
     onDrop (e) {
       this.$emit('drop-field', {
-        x: e.layerX,
+        x: e.offsetX,
-        y: e.layerY,
+        y: e.offsetY,
         maskW: this.$refs.mask.clientWidth,
         maskH: this.$refs.mask.clientHeight,
         page: this.number
@@ -186,10 +193,10 @@ export default {
 
       this.$nextTick(() => {
         this.newArea = {
-          initialX: e.layerX / this.$refs.mask.clientWidth,
+          initialX: e.offsetX / this.$refs.mask.clientWidth,
-          initialY: e.layerY / this.$refs.mask.clientHeight,
+          initialY: e.offsetY / this.$refs.mask.clientHeight,
-          x: e.layerX / this.$refs.mask.clientWidth,
+          x: e.offsetX / this.$refs.mask.clientWidth,
-          y: e.layerY / this.$refs.mask.clientHeight,
+          y: e.offsetY / this.$refs.mask.clientHeight,
           w: 0,
           h: 0
         }
@@ -197,19 +204,19 @@ export default {
     },
     onPointermove (e) {
       if (this.newArea) {
-        const dx = e.layerX / this.$refs.mask.clientWidth - this.newArea.initialX
+        const dx = e.offsetX / this.$refs.mask.clientWidth - this.newArea.initialX
-        const dy = e.layerY / this.$refs.mask.clientHeight - this.newArea.initialY
+        const dy = e.offsetY / this.$refs.mask.clientHeight - this.newArea.initialY
 
         if (dx > 0) {
           this.newArea.x = this.newArea.initialX
         } else {
-          this.newArea.x = e.layerX / this.$refs.mask.clientWidth
+          this.newArea.x = e.offsetX / this.$refs.mask.clientWidth
         }
 
         if (dy > 0) {
           this.newArea.y = this.newArea.initialY
         } else {
-          this.newArea.y = e.layerY / this.$refs.mask.clientHeight
+          this.newArea.y = e.offsetY / this.$refs.mask.clientHeight
         }
 
         if (this.drawField?.type === 'cells') {

app/javascript/template_builder/payment_settings.vue

@@ -167,7 +167,7 @@ export default {
     IconInnerShadowTop,
     IconBrandStripe
   },
-  inject: ['backgroundColor', 'save', 'currencies', 't'],
+  inject: ['backgroundColor', 'save', 'currencies', 't', 'isPaymentConnected'],
   props: {
     field: {
       type: Object,
@@ -221,6 +221,8 @@ export default {
   mounted () {
     this.field.preferences.currency ||= this.defaultCurrency
 
+    isConnected.value ||= this.isPaymentConnected
+
     if (!this.isConnected) {
       this.checkStatus()
     }

app/javascript/template_builder/upload.vue

@@ -119,7 +119,7 @@ export default {
 
         this.isProcessing = true
 
-        this.baseFetch(`/api/templates/${this.templateId}/documents`, {
+        this.baseFetch(`/templates/${this.templateId}/documents`, {
           method: 'POST',
           body: JSON.stringify({ blobs }),
           headers: { 'Content-Type': 'application/json' }
@@ -132,7 +132,7 @@ export default {
           } else if (resp.status === 422) {
             resp.json().then((data) => {
               if (data.error === 'PDF encrypted') {
-                this.baseFetch(`/api/templates/${this.templateId}/documents`, {
+                this.baseFetch(`/templates/${this.templateId}/documents`, {
                   method: 'POST',
                   body: JSON.stringify({ blobs, password: prompt('Enter PDF password') }),
                   headers: { 'Content-Type': 'application/json' }
@@ -151,7 +151,7 @@ export default {
           this.isProcessing = false
         })
       } else {
-        this.baseFetch(`/api/templates/${this.templateId}/documents`, {
+        this.baseFetch(`/templates/${this.templateId}/documents`, {
           method: 'POST',
           body: new FormData(this.$refs.form)
         }).then((resp) => {
@@ -167,7 +167,7 @@ export default {
 
                 formData.append('password', prompt('Enter PDF password'))
 
-                this.baseFetch(`/api/templates/${this.templateId}/documents`, {
+                this.baseFetch(`/templates/${this.templateId}/documents`, {
                   method: 'POST',
                   body: formData
                 }).then(async (resp) => {

app/jobs/process_submitter_completion_job.rb

@@ -27,14 +27,15 @@ 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.submission.submitters.map(&:email).exclude?(user.email) &&
+      if submission.submitters.map(&:email).exclude?(user.email) &&
-         user.user_configs.find_by(key: UserConfig::RECEIVE_COMPLETED_EMAIL)&.value != false
+         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.account.account_configs
-                      .find_by(key: AccountConfig::BCC_EMAILS)&.value.presence
+                      .find_by(key: AccountConfig::BCC_EMAILS)&.value
 
       bcc.to_s.scan(User::EMAIL_REGEXP).each do |to|
         SubmitterMailer.completed_email(submitter, user, to:).deliver_later!

app/mailers/submitter_mailer.rb

@@ -7,7 +7,7 @@ class SubmitterMailer < ApplicationMailer
   DEFAULT_INVITATION_SUBJECT = 'You are invited to submit a form'
 
   def invitation_email(submitter)
-    @current_account = submitter.submission.template.account
+    @current_account = submitter.submission.account
     @submitter = submitter
 
     if submitter.preferences['email_message_uuid']
@@ -30,12 +30,13 @@ class SubmitterMailer < ApplicationMailer
       to: @submitter.friendly_name,
       from: from_address_for_submitter(submitter),
       subject:,
-      reply_to: (submitter.submission.created_by_user || submitter.template.author)&.friendly_name&.sub(/\+\w+@/, '@')
+      reply_to: submitter.preferences['reply_to'].presence ||
+                (submitter.submission.created_by_user || submitter.template.author)&.friendly_name&.sub(/\+\w+@/, '@')
     )
   end
 
   def completed_email(submitter, user, to: nil)
-    @current_account = submitter.submission.template.account
+    @current_account = submitter.submission.account
     @submitter = submitter
     @submission = submitter.submission
     @user = user
@@ -63,7 +64,7 @@ class SubmitterMailer < ApplicationMailer
   end
 
   def documents_copy_email(submitter, to: nil, sig: false)
-    @current_account = submitter.submission.template.account
+    @current_account = submitter.submission.account
     @submitter = submitter
     @sig = submitter.signed_id(expires_in: SIGN_TTL, purpose: :download_completed) if sig
 
@@ -84,6 +85,9 @@ class SubmitterMailer < ApplicationMailer
 
     mail(from: from_address_for_submitter(submitter),
          to: to || @submitter.friendly_name,
+         reply_to: @submitter.preferences['reply_to'].presence ||
+                   (@submitter.submission.created_by_user ||
+                    @submitter.template.author)&.friendly_name&.sub(/\+\w+@/, '@'),
          subject:)
   end
 

app/views/layouts/mailer.html.erb

@@ -3,10 +3,9 @@
   <head>
     <title></title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <style>
+    <style></style>
-    </style>
   </head>
-  <body dir="<%= yield&.match?(TextUtils::RTL_REGEXP) ? 'rtl' : 'auto' %>">
+  <body dir="<%= TextUtils.rtl?(yield) ? 'rtl' : 'auto' %>">
     <%= yield %>
     <%= render partial: 'shared/mailer_attribution' %>
   </body>

app/views/personalization_settings/_form_customization_settings.html.erb

@@ -0,0 +1 @@
+<%= render 'form_toggle_options' %>

app/views/personalization_settings/_form_toggle_options.html.erb

@@ -0,0 +1,14 @@
+<% account_config = AccountConfig.where(account: current_account, key: AccountConfig::FORM_WITH_CONFETTI_KEY).first_or_initialize(value: true) %>
+<% if can?(:manage, account_config) %>
+  <div class="px-1 mt-2">
+    <%= 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>
+          Show confetti on successful completion
+        </span>
+        <%= f.check_box :value, { class: 'toggle', checked: account_config.value != false, onchange: 'this.form.requestSubmit()' }, '1', '0' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

app/views/personalization_settings/show.html.erb

@@ -9,8 +9,9 @@
     </div>
     <p class="text-4xl font-bold mb-4 mt-8">Company Logo</p>
     <%= render 'logo_form' %>
-    <p class="text-4xl font-bold mb-4 mt-8">Submitter Form</p>
+    <p class="text-4xl font-bold mb-4 mt-8">Submission Form</p>
     <%= render 'form_completed_button_form' %>
+    <%= render 'form_customization_settings' %>
   </div>
   <div class="w-0 md:w-52"></div>
 </div>

app/views/profile/index.html.erb

@@ -31,40 +31,42 @@
       </div>
     <% end %>
     <a href="<%= edit_user_signature_path %>" data-turbo-frame="modal" class="base-button w-full">Update Signature</a>
-    <p class="text-2xl font-bold mt-8 mb-4">Change Password</p>
+    <% if true_user == current_user && !current_account.testing? %>
-    <%= form_for current_user, url: update_password_settings_profile_index_path, method: :patch, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
+      <p class="text-2xl font-bold mt-8 mb-4">Change Password</p>
-      <div class="form-control">
+      <%= form_for current_user, url: update_password_settings_profile_index_path, method: :patch, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
-        <%= f.label :password, 'New password', class: 'label' %>
+        <div class="form-control">
-        <%= f.password_field :password, autocomplete: 'off', class: 'base-input' %>
+          <%= f.label :password, 'New password', class: 'label' %>
-      </div>
+          <%= f.password_field :password, autocomplete: 'off', class: 'base-input' %>
-      <div class="form-control">
+        </div>
-        <%= f.label :password_confirmation, 'Confirm new password', class: 'label' %>
+        <div class="form-control">
-        <%= f.password_field :password_confirmation, autocomplete: 'off', class: 'base-input' %>
+          <%= f.label :password_confirmation, 'Confirm new password', class: 'label' %>
-      </div>
+          <%= f.password_field :password_confirmation, autocomplete: 'off', class: 'base-input' %>
-      <div class="form-control pt-2">
+        </div>
-        <%= f.button button_title(title: 'Update', disabled_with: 'Updating'), class: 'base-button' %>
+        <div class="form-control pt-2">
+          <%= f.button button_title(title: 'Update', disabled_with: 'Updating'), class: 'base-button' %>
+        </div>
+      <% end %>
+      <p class="text-2xl font-bold mt-8 mb-4">Two-Factor Authentication</p>
+      <div class="space-y-4">
+        <% if current_user.otp_required_for_login %>
+          <p class="flex items-center space-x-1">
+            <%= svg_icon('circle_check', class: 'stroke-success inline flex-none w-5 h-5') %>
+            <span>
+              2FA has been configured.
+            </span>
+          </p>
+          <a href="<%= edit_mfa_setup_path %>" data-turbo-frame="modal" class="white-button w-full !px-8">🔓 Remove 2FA</a>
+        <% else %>
+          <p class="flex items-center space-x-1">
+            <%= svg_icon('info_circle', class: 'stroke-warning inline flex-none w-5 h-5') %>
+            <span>
+              2FA is not configured.
+            </span>
+          </p>
+          <a href="<%= new_mfa_setup_path %>" data-turbo-frame="modal" class="base-button w-full !px-8">🔒 Set up 2FA</a>
+        <% end %>
       </div>
     <% end %>
-    <p class="text-2xl font-bold mt-8 mb-4">Two-Factor Authentication</p>
-    <div class="space-y-4">
-      <% if current_user.otp_required_for_login %>
-        <p class="flex items-center space-x-1">
-          <%= svg_icon('circle_check', class: 'stroke-success inline flex-none w-5 h-5') %>
-          <span>
-            2FA has been configured.
-          </span>
-        </p>
-        <a href="<%= edit_mfa_setup_path %>" data-turbo-frame="modal" class="white-button w-full !px-8">🔓 Remove 2FA</a>
-      <% else %>
-        <p class="flex items-center space-x-1">
-          <%= svg_icon('info_circle', class: 'stroke-warning inline flex-none w-5 h-5') %>
-          <span>
-            2FA is not configured.
-          </span>
-        </p>
-        <a href="<%= new_mfa_setup_path %>" data-turbo-frame="modal" class="base-button w-full !px-8">🔒 Set up 2FA</a>
-      <% end %>
-    </div>
   </div>
   <div class="w-0 md:w-52"></div>
 </div>

app/views/scripts/_autosize_field.html.erb

@@ -5,6 +5,10 @@
         if (this.field.scrollHeight > this.field.clientHeight) {
           this.field.classList.remove('text-[1.5vw]', 'lg:text-base');
           this.field.classList.add('text-[1.0vw]', 'lg:text-[0.70rem]');
+
+          if (this.field.scrollHeight > this.field.clientHeight) {
+            this.field.classList.add('text-[0.8vw]', 'lg:text-[0.50rem]');
+          }
         }
       }
       get field() {

app/views/shared/_settings_nav.html.erb

@@ -39,7 +39,7 @@
       <% end %>
       <% if can?(:read, User) %>
         <li>
-          <%= link_to 'Team', settings_users_path, class: 'text-base hover:bg-base-300' %>
+          <%= link_to 'Users', settings_users_path, class: 'text-base hover:bg-base-300' %>
         </li>
       <% end %>
       <% unless Docuseal.multitenant? %>
@@ -67,7 +67,7 @@
         </li>
       <% end %>
       <%= render 'shared/settings_nav_extra' %>
-      <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) %>
+      <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) && (current_user != true_user || !current_account.testing?) %>
         <li>
           <%= link_to Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premise" }.to_query}", class: 'text-base hover:bg-base-300', data: { prefetch: false } do %>
             Plans
@@ -75,7 +75,7 @@
           <% end %>
         </li>
       <% end %>
-      <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) %>
+      <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) && (current_user != true_user || !current_account.testing?) %>
         <li>
           <%= link_to Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/api") : "#{Docuseal::CONSOLE_URL}/on_premise", class: 'text-base hover:bg-base-300', data: { prefetch: false } do %>
             <% if Docuseal.multitenant? %> API <% else %> Console <% end %>

app/views/submissions/_bulk_send_placeholder.html.erb

@@ -0,0 +1,11 @@
+<div class="alert">
+  <%= svg_icon('info_circle', class: 'w-6 h-6') %>
+  <div>
+    <p class="font-bold">Bulk send from Excel XLSX or CSV</p>
+    <p class="text-gray-700">
+      Unlock with DocuSeal Pro
+      <br>
+      <a class="link font-medium" target="_blank" href="<%= Docuseal.multitenant? ? console_redirect_index_path(redir: "#{Docuseal::CONSOLE_URL}/plans") : "#{Docuseal::CLOUD_URL}/sign_up?#{{ redir: "#{Docuseal::CONSOLE_URL}/on_premise" }.to_query}" %>" data-turbo="false">Learn More</a>
+    </p>
+  </div>
+</div>

app/views/submissions/_email_form.html.erb

@@ -1,11 +1,13 @@
 <%= form_for '', url: template_submissions_path(template), html: { class: 'space-y-4', autocomplete: 'off' }, data: { turbo_frame: :_top } do |f| %>
   <% if template.submitters.size == 1 %>
     <submitter-item class="form-control">
-      <submitters-autocomplete data-field="email">
+      <emails-textarea data-bulk-enabled="<%= Docuseal.demo? || !Docuseal.multitenant? || can?(:manage, :bulk_send) %>" data-limit="<%= Docuseal.multitenant? ? (can?(:manage, :bulk_send) ? 40 : 1) : nil %>">
-        <autoresize-textarea>
+        <submitters-autocomplete data-field="email" class="block relative">
-          <%= f.text_area :emails, required: true, class: 'base-textarea w-full', placeholder: 'Type emails here...' %>
+          <autoresize-textarea>
-        </autoresize-textarea>
+            <%= f.text_area :emails, required: true, class: 'base-textarea w-full', placeholder: 'Type emails here...' %>
-      </submitters-autocomplete>
+          </autoresize-textarea>
+        </submitters-autocomplete>
+      </emails-textarea>
     </submitter-item>
   <% else %>
     <dynamic-list class="space-y-4">

app/views/submissions/_list_form.html.erb

@@ -0,0 +1 @@
+<%= render 'submissions/bulk_send_placeholder' %>

app/views/submissions/_value.html.erb

@@ -1,4 +1,5 @@
-<field-value dir="auto" class="flex absolute text-[1.5vw] lg:text-base" style="width: <%= area['w'] * 100 %>%; height: <%= area['h'] * 100 %>%; left: <%= area['x'] * 100 %>%; top: <%= area['y'] * 100 %>%">
+<% 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 %>%">
   <% 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']) %>
@@ -17,7 +18,8 @@
     </div>
   <% elsif field['type'].in?(%w[multiple radio]) && area['option_uuid'] %>
     <% option = field['options']&.find { |o| o['uuid'] == area['option_uuid'] } %>
-    <% if option && Array.wrap(value).include?(option['value']) %>
+    <% option_name = option['value'].presence || "Option #{field['options'].index(option) + 1}" %>
+    <% if option && Array.wrap(value).include?(option_name) %>
       <div class="w-full flex items-center justify-center">
         <%= svg_icon('check', class: "aspect-square #{area['w'] > area['h'] ? '!w-auto !h-full' : '!w-full !h-auto'}") %>
       </div>
@@ -31,9 +33,10 @@
         <% end %>
       <% end %>
     </div>
-  <% elsif field['type'] == 'date' && value != '{{date}}' %>
+  <% elsif field['type'] == 'date' %>
     <autosize-field></autosize-field>
     <div class="flex items-center px-0.5">
+      <% value = Time.current.in_time_zone(local_assigns[:timezone]).to_date.to_s if value == '{{date}}' %>
       <%= TimeUtils.format_date_string(value, field.dig('preferences', 'format'), local_assigns[:locale]) %>
     </div>
   <% else %>

app/views/submissions/new.html.erb

@@ -1,5 +1,5 @@
 <%= render 'shared/turbo_modal', title: params[:selfsign] ? 'Add Recipients' : 'Add New Recipients' do %>
-  <% options = [['via Email', 'email'], ['via Phone', 'phone'], %w[Detailed detailed], (Docuseal.multitenant? && params[:with_link] && @template.submitters.to_a.size < 2 ? ['via Link', 'link'] : nil)].compact %>
+  <% options = [['via Email', 'email'], ['via Phone', 'phone'], %w[Detailed detailed], ['Upload List', 'list']].compact %>
   <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center mt-4 block">
     <div class="join">
       <% options.each_with_index do |(label, value), index| %>
@@ -22,11 +22,9 @@
     <div id="detailed" class="hidden">
       <%= render 'detailed_form', template: @template %>
     </div>
-    <% if Docuseal.multitenant? && params[:with_link] && @template.submitters.to_a.size < 2 %>
+    <div id="list" class="hidden">
-      <div id="link" class="hidden">
+      <%= render 'list_form', template: @template %>
-        <%= render 'link_form', template: @template %>
+    </div>
-      </div>
-    <% end %>
   </div>
   <%= content_for(:modal_extra) %>
 <% end %>

app/views/submissions/show.html.erb

@@ -1,6 +1,6 @@
 <div style="max-width: 1600px" class="mx-auto pl-4">
   <div class="flex justify-between py-1.5 items-center pr-4 sticky top-0 md:relative z-10 bg-base-100">
-    <a href="<%= signed_in? && @submission.template.account_id == current_account&.id ? template_path(@submission.template) : '/' %>" class="flex items-center space-x-3 py-1">
+    <a href="<%= signed_in? && @submission.account_id == current_account&.id ? template_path(@submission.template) : '/' %>" class="flex items-center space-x-3 py-1">
       <span><%= render 'submissions/logo' %></span>
       <span class="text-xl md:text-3xl font-semibold focus:text-clip" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;"><%= @submission.template.name %></span>
     </a>
@@ -63,7 +63,7 @@
                 <% fields_index.dig(document.uuid, index)&.each do |(area, field)| %>
                   <% value = values[field['uuid']] %>
                   <% next if value.blank? %>
-                  <%= render 'submissions/value', area:, field:, attachments_index:, value:, locale: @submission.template.account.locale %>
+                  <%= render 'submissions/value', area:, field:, attachments_index:, value:, locale: @submission.account.locale, timezone: @submission.account.timezone %>
                 <% end %>
               </div>
             </div>
@@ -112,7 +112,7 @@
             <div class="flex items-center space-x-1 mt-1">
               <%= svg_icon('writing', class: 'w-5 h-5') %>
               <span>
-                <%= submitter&.completed_at? ? l(submitter.completed_at.in_time_zone(@submission.template.account.timezone), format: :long, locale: @submission.template.account.locale) : 'Not completed yet' %>
+                <%= submitter&.completed_at? ? l(submitter.completed_at.in_time_zone(@submission.account.timezone), format: :long, locale: @submission.account.locale) : 'Not completed yet' %>
               </span>
             </div>
             <% if signed_in? && submitter && submitter.email && !submitter.completed_at && can?(:update, submitter) %>
@@ -162,7 +162,7 @@
                 <% elsif field['type'] == 'checkbox' %>
                   <%= svg_icon('check', class: 'w-6 h-6') %>
                 <% elsif field['type'] == 'date' %>
-                  <%= TimeUtils.format_date_string(value, field.dig('preferences', 'format'), @submission.template.account.locale) %>
+                  <%= TimeUtils.format_date_string(value, field.dig('preferences', 'format'), @submission.account.locale) %>
                 <% else %>
                   <%= Array.wrap(value).join(', ') %>
                 <% end %>

app/views/submit_form/_submission_form.html.erb

@@ -1,4 +1,4 @@
 <% 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-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.opened_at? %>" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(Struct.new(:id).new(@submitter.submission.template.account_id)) %>" 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-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.opened_at? %>" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(Struct.new(:id).new(@submitter.submission.account_id)) %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>"></submission-form>

app/views/submit_form/show.html.erb

@@ -21,11 +21,11 @@
                 <%= render 'submissions/annotation', annot: %>
               <% end %>
               <% fields_index.dig(document.uuid, index)&.each do |(area, field)| %>
-                <% value = values[field['uuid']].presence || (field['readonly'] ? Submitters::SubmitValues.template_default_value_for_submitter(field['default_value'], @submitter.submission.submitters.find { |e| e.uuid == field['submitter_uuid'] }, with_time: false) : nil) %>
+                <% value = values[field['uuid']].presence || (field['default_value'].present? ? Submitters::SubmitValues.template_default_value_for_submitter(field['default_value'], @submitter.submission.submitters.find { |e| e.uuid == field['submitter_uuid'] }, with_time: false) : nil) %>
                 <% next if value.blank? %>
                 <% next if !field['readonly'] && 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 %>
+                <%= render 'submissions/value', area:, field:, attachments_index:, value:, locale: @submitter.account.locale, timezone: @submitter.account.timezone %>
               <% end %>
             </div>
           </div>

app/views/submitter_mailer/_custom_content.html.erb

@@ -0,0 +1 @@
+<%= auto_link(simple_format(MarkdownToHtml.call(h(ReplaceEmailVariables.call(local_assigns[:content], submitter: local_assigns[:submitter], sig: local_assigns[:sig]))))) %>

app/views/submitter_mailer/completed_email.html.erb

@@ -1,5 +1,5 @@
 <% if @email_config %>
-  <%= auto_link(simple_format(h(ReplaceEmailVariables.call(@email_config.value['body'], submitter: @submitter)))) %>
+  <%= render 'custom_content', content: @email_config.value['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/submitter_mailer/documents_copy_email.html.erb

@@ -1,5 +1,5 @@
 <% if @email_config %>
-  <%= auto_link(simple_format(h(ReplaceEmailVariables.call(@email_config.value['body'], submitter: @submitter, sig: @sig)))) %>
+  <%= render 'custom_content', content: @email_config.value['body'], submitter: @submitter, sig: @sig %>
 <% else %>
   <p>Hi there,</p>
   <p>Please check the copy of your "<%= @submitter.submission.template.name %>" submission in the email attachments.</p>

app/views/submitter_mailer/invitation_email.html.erb

@@ -1,6 +1,6 @@
 <% if @email_config || @body.present? %>
   <% body = (@body.presence || @email_config.value['body']).to_s %>
-  <%= auto_link(simple_format(h(ReplaceEmailVariables.call(body, submitter: @submitter)))) %>
+  <%= render 'custom_content', content: body, submitter: @submitter %>
   <% if !body.include?(ReplaceEmailVariables::SUBMITTER_LINK) && !body.include?(ReplaceEmailVariables::SUBMITTER_ID) && !body.include?(ReplaceEmailVariables::SUBMISSION_LINK) && !body.include?(ReplaceEmailVariables::TEMPLATE_ID) && !@submitter.submission.source.in?(%w[api embed]) %>
     <p><%= link_to nil, submit_form_url(slug: @submitter.slug, t: SubmissionEvents.build_tracking_param(@submitter, 'click_email')) %></p>
   <% end %>

app/views/templates/new.html.erb

@@ -3,6 +3,11 @@
     <% if @base_template %>
       <%= hidden_field_tag :base_template_id, @base_template.id %>
     <% end %>
+    <% if @base_template && (can?(:manage, :tenants) || true_user != current_user) && true_user.account.account_linked_accounts.exists? %>
+      <div class="form-control -mb-2 mt-2">
+        <%= select_tag :account_id, options_for_select([true_user.account, *true_user.account.linked_accounts].uniq.map { |e| [e.name, e.id] }, current_account.id), required: true, class: 'base-select' %>
+      </div>
+    <% end %>
     <div class="form-control mt-6">
       <%= f.text_field :name, required: true, placeholder: 'Document Name', class: 'base-input', dir: 'auto' %>
     </div>
@@ -17,11 +22,6 @@
         </a>
       </folder-autocomplete>
     </div>
-    <% if @base_template && (can?(:manage, :tenants) || true_user != current_user) && true_user.account.account_linked_accounts.exists?(account_type: :linked) %>
-      <div class="form-control mb-4">
-        <%= select_tag :account_id, options_for_select([true_user.account, *true_user.account.linked_accounts.where.not(id: true_user.account.testing_accounts)].map { |e| [e.name, e.id] }, current_account.id), required: true, class: 'base-select' %>
-      </div>
-    <% end %>
     <div class="form-control">
       <%= f.button button_title(title: @base_template ? 'Submit' : 'Create', disabled_with: 'Creating'), class: 'base-button' %>
     </div>

app/views/users/index.html.erb

@@ -2,7 +2,7 @@
   <%= render 'shared/settings_nav' %>
   <div class="md:flex-grow">
     <div class="flex justify-between mb-4">
-      <h1 class="text-4xl font-bold">Team</h1>
+      <h1 class="text-4xl font-bold">Users</h1>
       <div class="flex items-center space-x-4">
         <% if can?(:create, User.new(account: current_account)) %>
           <%= link_to new_user_path, class: 'btn btn-primary btn-md gap-2', data: { turbo_frame: 'modal' } do %>

config/environments/production.rb

@@ -60,7 +60,7 @@ Rails.application.configure do
   # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = ENV['FORCE_SSL'].present?
+  config.force_ssl = ENV['FORCE_SSL'].present? && ENV['FORCE_SSL'] != 'false'
 
   # Include generic and useful information about system operation, but avoid logging too much
   # information to avoid inadvertent exposure of personally identifiable information (PII).
@@ -128,7 +128,7 @@ Rails.application.configure do
     config.lograge.formatter = ->(data) { data.except(:path, :location).to_json }
 
     config.lograge.custom_payload do |controller|
-      params = controller.request.params || {}
+      params = controller.request.try(:params) || {}
 
       {
         fwd: controller.request.ip,

config/initializers/active_storage.rb

@@ -69,7 +69,7 @@ Rails.configuration.to_prepare do
 
   LoadActiveStorageConfigs.call
 rescue StandardError => e
-  Rails.logger.error(e)
+  Rails.logger.error(e) unless Rails.env.production?
 
   nil
 end

config/initializers/hexapdf.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-# fix NoMethodError: undefined method `field_value' for #<HexaPDF::Type::AcroForm::Field
 module HexaPDF
   module Type
+    # fix NoMethodError: undefined method `field_value' for #<HexaPDF::Type::AcroForm::Field
     module AcroForm
       class Field
         def field_value
@@ -10,5 +10,34 @@ module HexaPDF
         end
       end
     end
+
+    # comparison of Integer with HexaPDF::PDFArray failed
+    class CIDFont < Font
+      private
+
+      def widths
+        cache(:widths) do
+          result = {}
+          index = 0
+          array = self[:W] || []
+
+          while index < array.size
+            entry = array[index]
+            value = array[index + 1]
+
+            if value.is_a?(Array) || value.is_a?(HexaPDF::PDFArray)
+              value.each_with_index { |width, i| result[entry + i] = width }
+              index += 2
+            else
+              width = array[index + 2]
+              entry.upto(value) { |cid| result[cid] = width }
+              index += 3
+            end
+          end
+
+          result
+        end
+      end
+    end
   end
 end

config/puma.rb

@@ -24,7 +24,7 @@ port ENV.fetch('PORT', 3000)
 environment ENV.fetch('RAILS_ENV', 'development')
 
 # Specifies the `pidfile` that Puma will use.
-pidfile ENV.fetch('PIDFILE', "#{Dir.tmpdir}/server.pid")
+@options[:pidfile] = false
 
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked web server processes. If using threads and workers together

config/routes.rb

@@ -24,8 +24,6 @@ Rails.application.routes.draw do
 
   namespace :api, defaults: { format: :json } do
     resources :attachments, only: %i[create]
-    resources :submitters_autocomplete, only: %i[index]
-    resources :template_folders_autocomplete, only: %i[index]
     resources :submitter_email_clicks, only: %i[create]
     resources :submitter_form_views, only: %i[create]
     resources :submitters, only: %i[index show update]
@@ -37,7 +35,6 @@ Rails.application.routes.draw do
     resources :templates, only: %i[update show index destroy] do
       resources :clone, only: %i[create], controller: 'templates_clone'
       resources :submissions, only: %i[index create]
-      resources :documents, only: %i[create], controller: 'templates_documents'
     end
   end
 
@@ -55,8 +52,11 @@ Rails.application.routes.draw do
   resource :user_signature, only: %i[edit update destroy]
   resources :submissions, only: %i[show destroy]
   resources :console_redirect, only: %i[index]
+  resources :upgrade, only: %i[index], controller: 'console_redirect'
   resource :testing_account, only: %i[show destroy]
   resources :testing_api_settings, only: %i[index]
+  resources :submitters_autocomplete, only: %i[index]
+  resources :template_folders_autocomplete, only: %i[index]
   resource :templates_upload, only: %i[create]
   authenticated do
     resource :templates_upload, only: %i[show], path: 'new'
@@ -64,7 +64,8 @@ Rails.application.routes.draw do
   resources :templates_archived, only: %i[index], path: 'archived'
   resources :folders, only: %i[show edit update destroy], controller: 'template_folders'
   resources :template_sharings_testing, only: %i[create]
-  resources :templates, only: %i[new create edit show destroy] do
+  resources :templates, only: %i[new create edit update show destroy] do
+    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'
     resources :submissions, only: %i[new create]

config/sidekiq.yml

@@ -2,6 +2,7 @@ queues:
   - [default, 1]
   - [mailers, 1]
   - [recurrent, 1]
+  - [rollbar, 1]
 
 production:
   :concurrency: 15

db/migrate/20231112224432_update_field_options.rb

@@ -9,7 +9,6 @@ class UpdateFieldOptions < ActiveRecord::Migration[7.0]
     self.table_name = 'submissions'
   end
 
-  # rubocop:disable Metrics
   def up
     MigrationTemplate.find_each do |template|
       next if template.fields.blank?
@@ -43,7 +42,6 @@ class UpdateFieldOptions < ActiveRecord::Migration[7.0]
       submission.update_columns(template_fields: new_fields.to_json) if template_fields != new_fields
     end
   end
-  # rubocop:enable Metrics
 
   def down
     nil

lib/accounts.rb

@@ -32,7 +32,7 @@ module Accounts
   end
 
   def find_or_create_testing_user(account)
-    user = User.find_by(account: account.testing_accounts)
+    user = User.where(role: :admin).order(:id).find_by(account: account.testing_accounts)
 
     return user if user
 

lib/action_mailer_configs_interceptor.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 module ActionMailerConfigsInterceptor
+  OPEN_TIMEOUT = 15
+  READ_TIMEOUT = 25
+
   module_function
 
   def delivering_email(message)
@@ -43,6 +46,8 @@ module ActionMailerConfigsInterceptor
       openssl_verify_mode: OpenSSL::SSL::VERIFY_NONE,
       authentication: value.fetch('authentication', 'plain'),
       enable_starttls_auto: true,
+      open_timeout: OPEN_TIMEOUT,
+      read_timeout: READ_TIMEOUT,
       ssl: value['security'] == 'ssl',
       tls: value['security'] == 'tls' || (value['security'].blank? && value['port'].to_s == '465')
     }.compact_blank

lib/markdown_to_html.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module MarkdownToHtml
+  LINK_REGEXP = %r{\[([^\]]+)\]\((https?://[^)]+)\)}
+  LINK_REPLACE = '<a href="\2">\1</a>'
+
+  module_function
+
+  def call(text)
+    text.gsub(LINK_REGEXP, LINK_REPLACE)
+  end
+end

lib/params/submission_create_validator.rb

@@ -42,6 +42,9 @@ module Params
       type(params, :order, String)
       type(params, :completed_redirect_url, String)
       type(params, :bcc_completed, String)
+      type(params, :reply_to, String)
+      format(params, :bcc_completed, /@/, message: 'bcc_completed email is invalid')
+      format(params, :reply_to, /@/, message: 'reply_to email is invalid')
       type(params, :message, Hash)
       type(params, :submitters, Array)
 
@@ -69,8 +72,10 @@ module Params
       required(submitter_params, %i[email phone name])
 
       type(submitter_params, :name, String)
+      type(submitter_params, :reply_to, String)
       type(submitter_params, :email, String)
       format(submitter_params, :email, /@/, message: 'email is invalid')
+      format(submitter_params, :reply_to, /@/, message: 'reply_to email is invalid')
       type(submitter_params, :phone, String)
       format(submitter_params, :phone, /\A\+\d+\z/,
              message: 'phone should start with +<country code> and contain only digits')
@@ -100,6 +105,7 @@ module Params
       type(params, :order, String)
       type(params, :completed_redirect_url, String)
       type(params, :bcc_completed, String)
+      format(params, :bcc_completed, /@/, message: 'bcc_completed email is invalid')
       type(params, :message, Hash)
 
       in_path(params, :message) do |message_params|

lib/rate_limit.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RateLimit
+  LimitApproached = Class.new(StandardError)
+
+  STORE = ActiveSupport::Cache::MemoryStore.new
+
+  module_function
+
+  def call(key, limit:, ttl:, enabled: Docuseal.multitenant?)
+    return true unless enabled
+
+    value = STORE.increment(key, 1, expires_in: ttl)
+
+    raise LimitApproached if value > limit
+
+    true
+  end
+end

lib/replace_email_variables.rb

@@ -5,6 +5,8 @@ module ReplaceEmailVariables
   TEMPLATE_ID = '{{template.id}}'
   SUBMITTER_LINK = '{{submitter.link}}'
   ACCOUNT_NAME = '{{account.name}}'
+  SENDER_NAME = '{{sender.name}}'
+  SENDER_EMAIL = '{{sender.email}}'
   SUBMITTER_EMAIL = '{{submitter.email}}'
   SUBMITTER_NAME = '{{submitter.name}}'
   SUBMITTER_ID = '{{submitter.id}}'
@@ -18,29 +20,25 @@ module ReplaceEmailVariables
   module_function
 
   # rubocop:disable Metrics
-  def call(text, submitter:, tracking_event_type: 'click_email', sig: nil)
+  def call(text, submitter:, tracking_event_type: 'click_email', html_escape: false, sig: nil)
-    submitter_link = build_submitter_link(submitter, tracking_event_type)
+    text = replace(text, TEMPLATE_NAME, html_escape:) { submitter.template.name }
-
+    text = replace(text, TEMPLATE_ID, html_escape:) { submitter.template.id }
-    submission_link = build_submission_link(submitter.submission) if submitter.submission
+    text = replace(text, SUBMITTER_ID, html_escape:) { submitter.id }
-
+    text = replace(text, SUBMITTER_SLUG, html_escape:) { submitter.slug }
-    text = text.gsub(TEMPLATE_NAME, submitter.template.name) if submitter.template
+    text = replace(text, SUBMISSION_ID, html_escape:) { submitter.submission.id }
-    text = text.gsub(TEMPLATE_ID, submitter.template.id.to_s) if submitter.template
+    text = replace(text, SUBMITTER_EMAIL, html_escape:) { submitter.email }
-    text = text.gsub(SUBMITTER_ID, submitter.id.to_s)
+    text = replace(text, SUBMITTER_NAME, html_escape:) { submitter.name || submitter.email || submitter.phone }
-    text = text.gsub(SUBMITTER_SLUG, submitter.slug.to_s)
+    text = replace(text, SUBMITTER_LINK, html_escape:) { build_submitter_link(submitter, tracking_event_type) }
-    text = text.gsub(SUBMISSION_ID, submitter.submission.id.to_s) if submitter.submission
+    text = replace(text, SUBMISSION_LINK, html_escape:) do
-    text = text.gsub(SUBMITTER_EMAIL, submitter.email) if submitter.email
+      submitter.submission ? build_submission_link(submitter.submission) : ''
-    text = text.gsub(SUBMITTER_NAME, submitter.name || submitter.email || submitter.phone)
-    text = text.gsub(SUBMITTER_LINK, submitter_link)
-    text = text.gsub(SUBMISSION_LINK, submission_link) if submission_link
-    if text.include?(SUBMISSION_SUBMITTERS)
-      text = text.gsub(SUBMISSION_SUBMITTERS, build_submission_submitters(submitter.submission))
     end
-    text = text.gsub(DOCUMENTS_LINKS, build_documents_links_text(submitter, sig))
+    text = replace(text, SUBMISSION_SUBMITTERS, html_escape:) { build_submission_submitters(submitter.submission) }
-    text = text.gsub(DOCUMENTS_LINK, build_documents_links_text(submitter, sig))
+    text = replace(text, DOCUMENTS_LINKS, html_escape:) { build_documents_links_text(submitter, sig) }
+    text = replace(text, DOCUMENTS_LINK, html_escape:) { build_documents_links_text(submitter, sig) }
+    text = replace(text, ACCOUNT_NAME, html_escape:) { submitter.submission.account.name }
+    text = replace(text, SENDER_NAME, html_escape:) { submitter.submission.created_by_user&.full_name }
 
-    text = text.gsub(ACCOUNT_NAME, submitter.account.name) if submitter.account
+    replace(text, SENDER_EMAIL, html_escape:) { submitter.submission.created_by_user&.email.to_s.sub(/\+\w+@/, '@') }
-
-    text
   end
   # rubocop:enable Metrics
 
@@ -50,6 +48,16 @@ module ReplaceEmailVariables
     )
   end
 
+  def replace(text, var, html_escape: false)
+    text.gsub(var) do
+      if html_escape
+        ERB::Util.html_escape(yield)
+      else
+        yield
+      end
+    end
+  end
+
   def build_submitter_link(submitter, tracking_event_type)
     if tracking_event_type == 'click_email'
       Rails.application.routes.url_helpers.submit_form_url(

lib/submissions.rb

@@ -7,7 +7,7 @@ module Submissions
 
   module_function
 
-  def search(submissions, keyword)
+  def search(submissions, keyword, search_values: false)
     return submissions if keyword.blank?
 
     term = "%#{keyword.downcase}%"
@@ -18,6 +18,8 @@ module Submissions
                              .or(arel_table[:phone].matches(term))
                              .or(arel_table[:name].lower.matches(term))
 
+    arel = arel.or(Arel::Table.new(:submitters)[:values].matches(term)) if search_values
+
     submissions.joins(:submitters).where(arel).distinct
   end
 

lib/submissions/create_from_submitters.rb

@@ -7,7 +7,7 @@ module Submissions
     def call(template:, user:, submissions_attrs:, source:, submitters_order:, mark_as_sent: false, params: {})
       preferences = Submitters.normalize_preferences(user.account, user, params)
 
-      Array.wrap(submissions_attrs).map do |attrs|
+      Array.wrap(submissions_attrs).filter_map do |attrs|
         submission_preferences = Submitters.normalize_preferences(user.account, user, attrs)
         submission_preferences = preferences.merge(submission_preferences)
 
@@ -36,6 +36,8 @@ module Submissions
                           preferences: preferences.merge(submission_preferences))
         end
 
+        next if submission.submitters.blank?
+
         submission.tap(&:save!)
       end
     end
@@ -52,7 +54,8 @@ module Submissions
         process_fields_param(submitter_attrs[:fields], template_fields, submitter_uuid)
       end
 
-      if template_fields != submission.template.fields
+      if template_fields != (submission.template_fields || submission.template.fields) ||
+         submitters_attrs.any? { |e| e[:completed].present? }
         submission.template_fields = template_fields
         submission.template_schema = submission.template.schema
       end
@@ -80,11 +83,15 @@ module Submissions
         next if f['type'].in?(%w[signature image initials file])
         next if f['submitter_uuid'] != submitter_uuid
 
+        next unless values.key?(f['uuid'])
+
         value = values[f['uuid']]
 
-        next if value.blank?
+        if value.present?
-
+          f['default_value'] = value
-        f['default_value'] = value
+        else
+          f.delete('default_value')
+        end
       end
     end
 
@@ -110,8 +117,12 @@ module Submissions
       field['readonly'] = attrs['readonly'] if attrs.key?('readonly')
       field['required'] = attrs['required'] if attrs.key?('required')
 
-      if attrs['default_value'].present? && !field['type'].in?(%w[signature image initials file])
+      if attrs.key?('default_value') && !field['type'].in?(%w[signature image initials file])
-        field['default_value'] = Submitters::NormalizeValues.normalize_value(field, attrs['default_value'])
+        if attrs['default_value'].present?
+          field['default_value'] = Submitters::NormalizeValues.normalize_value(field, attrs['default_value'])
+        else
+          field.delete('default_value')
+        end
       end
 
       return field if attrs['validation_pattern'].blank?
@@ -125,9 +136,10 @@ module Submissions
     end
 
     def find_submitter_uuid(template, attrs, index)
-      attrs[:uuid].presence ||
+      uuid = attrs[:uuid].presence
-        template.submitters.find { |e| e['name'] == attrs[:role] }&.dig('uuid') ||
+      uuid ||= template.submitters.find { |e| e['name'].to_s.casecmp(attrs[:role].to_s).zero? }&.dig('uuid')
-        template.submitters[index]&.dig('uuid')
+
+      uuid || template.submitters[index]&.dig('uuid')
     end
 
     def build_submitter(submission:, attrs:, uuid:, is_order_sent:, mark_as_sent:, user:, preferences:)
@@ -139,7 +151,7 @@ module Submissions
         phone: attrs[:phone].to_s.gsub(/[^0-9+]/, ''),
         name: attrs[:name],
         external_id: attrs[:external_id].presence || attrs[:application_key],
-        completed_at: attrs[:completed] ? Time.current : nil,
+        completed_at: attrs[:completed].present? ? Time.current : nil,
         sent_at: mark_as_sent && email.present? && is_order_sent ? Time.current : nil,
         values: attrs[:values] || {},
         metadata: attrs[:metadata] || {},

lib/submissions/ensure_result_generated.rb

@@ -33,7 +33,10 @@ module Submissions
       sleep WAIT_FOR_RETRY
 
       retry
-    rescue StandardError
+    rescue StandardError => e
+      Rollbar.error(e) if defined?(Rollbar)
+      Rails.logger.error(e)
+
       submitter.document_generation_events.create!(event_name: :fail)
 
       raise

lib/submissions/generate_audit_trail.rb

@@ -30,17 +30,27 @@ module Submissions
     RTL_REGEXP = TextUtils::RTL_REGEXP
     MAX_IMAGE_HEIGHT = 100
 
+    US_TIMEZONES = %w[EST CST MST PST HST AKDT].freeze
+
     module_function
 
     # rubocop:disable Metrics
     def call(submission)
-      account = submission.template.account
+      account = submission.account
       pkcs = Accounts.load_signing_pkcs(account)
       tsa_url = Accounts.load_timeserver_url(account)
       verify_url = Rails.application.routes.url_helpers.settings_esign_url(**Docuseal.default_url_options)
+      page_size =
+        if TimeUtils.timezone_abbr(account.timezone, Time.current.beginning_of_year).in?(US_TIMEZONES)
+          :Letter
+        else
+          :A4
+        end
 
       composer = HexaPDF::Composer.new(skip_page_creation: true)
       composer.document.fonts.add(FONT_BOLD_NAME, variant: :bold)
+      composer.document.config['font.on_missing_glyph'] =
+        Submissions::GenerateResultAttachments.method(:on_missing_glyph).to_proc
 
       divider = HexaPDF::Layout::Box.create(
         margin: [0, 0, 15, 0],
@@ -51,7 +61,7 @@ module Submissions
         height: 1
       )
 
-      composer.page_style(:default, page_size: :A4) do |canvas, style|
+      composer.page_style(:default, page_size:) do |canvas, style|
         box = canvas.context.box(:media)
         canvas.save_graphics_state do
           canvas.fill_color('FAF7F5')
@@ -90,7 +100,10 @@ module Submissions
       last_submitter = submission.submitters.where.not(completed_at: nil).order(:completed_at).last
 
       documents_data = Submitters.select_attachments_for_download(last_submitter).map do |document|
-        original_documents = submission.template.documents.select { |e| e.uuid == document.uuid }.presence
+        original_documents = submission.template.documents.select do |e|
+          e.uuid == (document.metadata['original_uuid'] || document.uuid)
+        end.presence
+
         original_documents ||= submission.template.documents.select do |e|
           e.image? && submission.template_schema.any? do |item|
             item['attachment_uuid'] == e.uuid
@@ -242,7 +255,6 @@ module Submissions
               end
 
               value = value.join(', ') if value.is_a?(Array)
-              value = Submissions::GenerateResultAttachments::REPLACE_EMOJI[value] || value
 
               composer.formatted_text_box([{ text: TextUtils.maybe_rtl_reverse(value.to_s.presence || 'n/a') }],
                                           text_align: value.to_s.match?(RTL_REGEXP) ? :right : :left,

lib/submissions/generate_result_attachments.rb

@@ -21,9 +21,18 @@ module Submissions
     A4_SIZE = [595, 842].freeze
     SUPPORTED_IMAGE_TYPES = ['image/png', 'image/jpeg'].freeze
 
-    REPLACE_EMOJI = {
+    MISSING_GLYPH_REPLACE = {
+      '▪' => '-',
       '✔️' => 'V',
-      '✔' => 'V'
+      '✔' => 'V',
+      '✅' => 'V'
+    }.freeze
+
+    MISSING_GLYPH_REPLACE_TYPE1 = {
+      '▪' => :bullet,
+      '✔️' => :V,
+      '✔' => :V,
+      '✅' => :V
     }.freeze
 
     module_function
@@ -34,7 +43,7 @@ module Submissions
 
       template = submitter.submission.template
 
-      account = submitter.submission.template.account
+      account = submitter.account
       pkcs = Accounts.load_signing_pkcs(account)
       tsa_url = Accounts.load_timeserver_url(account)
       attachments_data_cache = {}
@@ -62,16 +71,24 @@ module Submissions
 
           width = page.box.width
           height = page.box.height
-          font_size = ((page.box.width / A4_SIZE[0].to_f) * FONT_SIZE).to_i
+          font_size = (([page.box.width, page.box.height].min / A4_SIZE[0].to_f) * FONT_SIZE).to_i
 
           value = submitter.values[field['uuid']]
 
-          layouter = HexaPDF::Layout::TextLayouter.new(text_valign: :center,
+          text_align = field.dig('preferences', 'align').to_s.to_sym.presence ||
-                                                       text_align: value.to_s.match?(RTL_REGEXP) ? :right : :left,
+                       (value.to_s.match?(RTL_REGEXP) ? :right : :left)
+
+          layouter = HexaPDF::Layout::TextLayouter.new(text_valign: :center, text_align:,
                                                        font: pdf.fonts.add(FONT_NAME), font_size:)
 
           next if Array.wrap(value).compact_blank.blank?
 
+          begin
+            page.flatten_annotations
+          rescue StandardError => e
+            Rollbar.error(e) if defined?(Rollbar)
+          end
+
           canvas = page.canvas(type: :overlay)
           canvas.font(FONT_NAME, size: font_size)
 
@@ -148,7 +165,9 @@ module Submissions
             if field['type'].in?(%w[multiple radio])
               option = field['options']&.find { |o| o['uuid'] == area['option_uuid'] }
 
-              value = Array.wrap(value).include?(option['value'])
+              option_name = option['value'].presence || "Option #{field['options'].index(option) + 1}"
+
+              value = Array.wrap(value).include?(option_name)
             end
 
             next unless value == true
@@ -181,7 +200,6 @@ module Submissions
             end
 
             value = TextUtils.maybe_rtl_reverse(Array.wrap(value).join(', '))
-            value = REPLACE_EMOJI[value] || value
 
             text = HexaPDF::Layout::TextFragment.create(value, font: pdf.fonts.add(FONT_NAME),
                                                                font_size:)
@@ -194,15 +212,33 @@ module Submissions
                                                           font: pdf.fonts.add(FONT_NAME),
                                                           font_size: (font_size / 1.4).to_i)
 
-              lines = layouter.fit([text], area['w'] * width, height).lines
+              lines = layouter.fit([text], field['type'].in?(%w[date number]) ? width : area['w'] * width, height).lines
+
+              box_height = lines.sum(&:height)
+            end
+
+            if 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)
+
+              lines = layouter.fit([text], field['type'].in?(%w[date number]) ? width : area['w'] * width, height).lines
 
               box_height = lines.sum(&:height)
             end
 
             height_diff = [0, box_height - (area['h'] * height)].max
 
-            layouter.fit([text], area['w'] * width, height_diff.positive? ? box_height : area['h'] * height)
+            right_align_x_adjustment =
-                    .draw(canvas, (area['x'] * width) + TEXT_LEFT_MARGIN,
+              if field['type'].in?(%w[date number]) && text_align != :left
+                (width - (area['w'] * width)) / (text_align == :center ? 2.0 : 1)
+              else
+                0
+              end
+
+            layouter.fit([text], field['type'].in?(%w[date number]) ? width : area['w'] * width,
+                         height_diff.positive? ? box_height : area['h'] * height)
+                    .draw(canvas, (area['x'] * width) - right_align_x_adjustment + TEXT_LEFT_MARGIN,
                           height - (area['y'] * height) + height_diff - TEXT_TOP_MARGIN)
           end
         end
@@ -211,28 +247,28 @@ module Submissions
       image_pdfs = []
       original_documents = template.documents.preload(:blob)
 
-      results =
+      result_attachments =
         submitter.submission.template_schema.map do |item|
           pdf = pdfs_index[item['attachment_uuid']]
 
-          attachment = save_pdf(pdf:, submitter:, pkcs:, tsa_url:,
+          attachment = build_pdf_attachment(pdf:, submitter:, pkcs:, tsa_url:,
-                                uuid: item['attachment_uuid'],
+                                            uuid: item['attachment_uuid'],
-                                name: item['name'])
+                                            name: item['name'])
 
           image_pdfs << pdf if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
 
           attachment
         end
 
-      return results if image_pdfs.size < 2
+      return result_attachments.map { |e| e.tap(&:save!) } if image_pdfs.size < 2
 
       images_pdf =
         image_pdfs.each_with_object(HexaPDF::Document.new) do |pdf, doc|
           pdf.pages.each { |page| doc.pages << doc.import(page) }
         end
 
-      images_pdf_result =
+      images_pdf_attachment =
-        save_pdf(
+        build_pdf_attachment(
           pdf: images_pdf,
           submitter:,
           tsa_url:,
@@ -241,11 +277,10 @@ module Submissions
           name: template.name
         )
 
-      results + [images_pdf_result]
+      (result_attachments + [images_pdf_attachment]).map { |e| e.tap(&:save!) }
     end
-    # rubocop:enable Metrics
 
-    def save_pdf(pdf:, submitter:, pkcs:, tsa_url:, uuid:, name:)
+    def build_pdf_attachment(pdf:, submitter:, pkcs:, tsa_url:, uuid:, name:)
       io = StringIO.new
 
       pdf.trailer.info[:Creator] = info_creator
@@ -265,12 +300,25 @@ module Submissions
           sign_params[:signature_size] = 10_000
         end
 
-        pdf.sign(io, write_options: { validate: false }, **sign_params)
+        begin
-      else
+          pdf.sign(io, write_options: { validate: false }, **sign_params)
-        pdf.write(io, incremental: true, validate: false)
+        rescue HexaPDF::MalformedPDFError => e
-      end
+          Rollbar.error(e) if defined?(Rollbar)
 
-      ActiveStorage::Attachment.create!(
+          pdf.sign(io, write_options: { validate: false, incremental: false }, **sign_params)
+        end
+      else
+        begin
+          pdf.write(io, incremental: true, validate: false)
+        rescue HexaPDF::MalformedPDFError => e
+          Rollbar.error(e) if defined?(Rollbar)
+
+          pdf.write(io, incremental: false, validate: false)
+        end
+      end
+      # rubocop:enable Metrics
+
+      ActiveStorage::Attachment.new(
         blob: ActiveStorage::Blob.create_and_upload!(io: StringIO.new(io.string), filename: "#{name}.pdf"),
         metadata: { original_uuid: uuid,
                     analyzed: true,
@@ -306,10 +354,25 @@ module Submissions
           Rollbar.error(e) if defined?(Rollbar)
         end
 
+        pdf.config['font.on_missing_glyph'] = method(:on_missing_glyph).to_proc
+
         [attachment.metadata['original_uuid'] || attachment.uuid, pdf]
       end
     end
 
+    def on_missing_glyph(character, font_wrapper)
+      Rollbar.error("Missing glyph: #{character}") if character.present? && defined?(Rollbar)
+
+      replace_with =
+        if font_wrapper.font_type == :Type1
+          MISSING_GLYPH_REPLACE_TYPE1[character] || :space
+        else
+          (MISSING_GLYPH_REPLACE[character] || ' ').bytes.first - 29
+        end
+
+      font_wrapper.custom_glyph(replace_with, character)
+    end
+
     def find_last_submitter(submitter)
       submitter.submission.submitters
                .select(&:completed_at?)

lib/submissions/normalize_param_utils.rb

@@ -22,7 +22,7 @@ module Submissions
       default_values = submitter_params[:values] || {}
 
       submitter_params[:fields]&.each do |f|
-        default_values[f[:name]] = f[:default_value] if f[:default_value].present?
+        default_values[f[:name]] = f[:default_value] if f.key?(:default_value)
       end
 
       return submitter_params if default_values.blank?

lib/submitters.rb

@@ -61,6 +61,7 @@ module Submitters
     preferences['send_email'] = params['send_email'].in?(TRUE_VALUES) if params.key?('send_email')
     preferences['send_sms'] = params['send_sms'].in?(TRUE_VALUES) if params.key?('send_sms')
     preferences['bcc_completed'] = params['bcc_completed'] if params.key?('bcc_completed')
+    preferences['reply_to'] = params['reply_to'] if params.key?('reply_to')
     preferences['completed_redirect_url'] = params['completed_redirect_url'] if params.key?('completed_redirect_url')
 
     preferences

lib/submitters/create_stamp_attachment.rb

@@ -13,8 +13,8 @@ module Submitters
 
     module_function
 
-    def call(submitter)
+    def call(submitter, with_logo: true)
-      image = generate_stamp_image(submitter)
+      image = generate_stamp_image(submitter, with_logo:)
 
       image_data = image.write_to_buffer('.png')
 
@@ -30,8 +30,13 @@ module Submitters
       )
     end
 
-    def generate_stamp_image(submitter)
+    def generate_stamp_image(submitter, with_logo: true)
-      logo = Vips::Image.new_from_buffer(load_logo(submitter).read, '')
+      logo =
+        if with_logo
+          Vips::Image.new_from_buffer(load_logo(submitter).read, '')
+        else
+          Vips::Image.new_from_buffer(TRANSPARENT_PIXEL, '').resize(WIDTH)
+        end
 
       logo = logo.resize([WIDTH / logo.width.to_f, HEIGHT / logo.height.to_f].min)
 

lib/submitters/form_configs.rb

@@ -2,20 +2,27 @@
 
 module Submitters
   module FormConfigs
+    DEFAULT_KEYS = [AccountConfig::FORM_COMPLETED_BUTTON_KEY,
+                    AccountConfig::FORM_WITH_CONFETTI_KEY,
+                    AccountConfig::ALLOW_TYPED_SIGNATURE].freeze
+
     module_function
 
-    def call(submitter)
+    def call(submitter, keys = [])
-      configs = submitter.submission.template.account.account_configs
+      configs = submitter.submission.account.account_configs
-                         .where(key: [AccountConfig::FORM_COMPLETED_BUTTON_KEY,
+                         .where(key: DEFAULT_KEYS + keys)
-                                      AccountConfig::FORM_WITH_CONFETTI_KEY,
-                                      AccountConfig::ALLOW_TYPED_SIGNATURE])
 
       completed_button = configs.find { |e| e.key == AccountConfig::FORM_COMPLETED_BUTTON_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:, with_typed_signature:, with_confetti: }
+      attrs = { completed_button:, with_typed_signature:, with_confetti: }
+
+      keys.each do |key|
+        attrs[key.to_sym] = configs.find { |e| e.key == key.to_s }&.value
+      end
+
+      attrs
     end
   end
 end