Merge from docusealco/wip

.github/workflows/docker.yml

@@ -1,13 +1,26 @@
 name: Build Docker Images
 
 on:
-  push:
+  workflow_dispatch:
-    tags:
+    inputs:
-      - "*.*.*"
+      version:
+        description: Version
+        type: string
+        required: true
+      image:
+        description: QEMU image
+        type: string
+        required: false
+        default: tonistiigi/binfmt:latest
+      os:
+        description: OS
+        type: string
+        required: false
+        default: ubuntu-24.04-arm
 
 jobs:
   build:
-    runs-on: ubuntu-24.04-arm
+    runs-on: ${{ inputs.os }}
     timeout-minutes: 20
 
     steps:
@@ -16,23 +29,23 @@ jobs:
       with:
         submodules: recursive
 
-    -
+    - name: Docker meta
-      name: Docker meta
       id: meta
       uses: docker/metadata-action@v4
       with:
-        images: |
+        images: docuseal/docuseal
-          docuseal/docuseal
+        tags: latest,${{ inputs.version }}
-        tags: |
+
-          type=semver,pattern={{version}}
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
+      with:
+        image: ${{ inputs.image }}
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
     - name: Create .version file
-      run: echo ${{ github.ref_name }} > .version
+      run: echo ${{ inputs.version }} > .version
 
     - name: Login to Docker Hub
       uses: docker/login-action@v3

Dockerfile

@@ -50,7 +50,7 @@ ENV OPENSSL_CONF=/app/openssl_legacy.cnf
 
 WORKDIR /app
 
-RUN echo '@edge https://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev@edge redis libheif@edge vips-heif@edge gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
+RUN echo '@edge https://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev@edge yaml-dev redis libheif@edge vips-heif@edge gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
 
 RUN echo $'.include = /etc/ssl/openssl.cnf\n\
 \n\

Gemfile.lock

@@ -1,29 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (8.0.1)
+    actioncable (8.0.2.1)
-      actionpack (= 8.0.1)
+      actionpack (= 8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.1)
+    actionmailbox (8.0.2.1)
-      actionpack (= 8.0.1)
+      actionpack (= 8.0.2.1)
-      activejob (= 8.0.1)
+      activejob (= 8.0.2.1)
-      activerecord (= 8.0.1)
+      activerecord (= 8.0.2.1)
-      activestorage (= 8.0.1)
+      activestorage (= 8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       mail (>= 2.8.0)
-    actionmailer (8.0.1)
+    actionmailer (8.0.2.1)
-      actionpack (= 8.0.1)
+      actionpack (= 8.0.2.1)
-      actionview (= 8.0.1)
+      actionview (= 8.0.2.1)
-      activejob (= 8.0.1)
+      activejob (= 8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.0.1)
+    actionpack (8.0.2.1)
-      actionview (= 8.0.1)
+      actionview (= 8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -31,35 +31,35 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.0.1)
+    actiontext (8.0.2.1)
-      actionpack (= 8.0.1)
+      actionpack (= 8.0.2.1)
-      activerecord (= 8.0.1)
+      activerecord (= 8.0.2.1)
-      activestorage (= 8.0.1)
+      activestorage (= 8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.1)
+    actionview (8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (8.0.1)
+    activejob (8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       globalid (>= 0.3.6)
-    activemodel (8.0.1)
+    activemodel (8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
-    activerecord (8.0.1)
+    activerecord (8.0.2.1)
-      activemodel (= 8.0.1)
+      activemodel (= 8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       timeout (>= 0.4.0)
-    activestorage (8.0.1)
+    activestorage (8.0.2.1)
-      actionpack (= 8.0.1)
+      actionpack (= 8.0.2.1)
-      activejob (= 8.0.1)
+      activejob (= 8.0.2.1)
-      activerecord (= 8.0.1)
+      activerecord (= 8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       marcel (~> 1.0)
-    activesupport (8.0.1)
+    activesupport (8.0.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -104,9 +104,9 @@ GEM
       faraday_middleware (~> 1.0, >= 1.0.0.rc1)
       net-http-persistent (~> 4.0)
       nokogiri (~> 1, >= 1.10.8)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcrypt (3.1.20)
-    benchmark (0.4.0)
+    benchmark (0.4.1)
     better_html (2.1.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
@@ -114,7 +114,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.8)
+    bigdecimal (3.2.2)
     bindex (0.8.1)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
@@ -141,8 +141,8 @@ GEM
     cldr-plurals-runtime-rb (1.1.0)
     cmdparse (3.0.7)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
-    connection_pool (2.4.1)
+    connection_pool (2.5.3)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -174,8 +174,9 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     docile (1.4.1)
     dotenv (3.1.7)
-    drb (2.2.1)
+    drb (2.2.3)
     email_typo (0.2.3)
+    erb (5.0.2)
     erb_lint (0.7.0)
       activesupport
       better_html (>= 2.0.1)
@@ -276,13 +277,14 @@ GEM
       openssl (>= 2.2.1)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.0)
+    io-console (0.8.1)
-    irb (1.14.3)
+    irb (1.15.2)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -300,13 +302,13 @@ GEM
       letter_opener (~> 1.9)
       railties (>= 6.1)
       rexml
-    logger (1.6.4)
+    logger (1.7.0)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.23.1)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -319,8 +321,8 @@ GEM
     method_source (1.1.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
-    minitest (5.25.4)
+    minitest (5.25.5)
     msgpack (1.7.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -328,28 +330,28 @@ GEM
     mysql2 (0.5.6)
     net-http-persistent (4.0.5)
       connection_pool (~> 2.2)
-    net-imap (0.5.6)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.8)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.8-aarch64-linux-gnu)
+    nokogiri (1.18.9-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-aarch64-linux-musl)
+    nokogiri (1.18.9-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-musl)
+    nokogiri (1.18.9-x86_64-linux-musl)
       racc (~> 1.4)
     oj (3.16.8)
       bigdecimal (>= 3.0)
@@ -365,6 +367,8 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
+    pp (0.6.2)
+      prettyprint
     premailer (1.27.0)
       addressable
       css_parser (>= 1.19.0)
@@ -375,42 +379,44 @@ GEM
       premailer (~> 1.7, >= 1.7.9)
     pretender (0.5.0)
       actionpack (>= 6.1)
+    prettyprint (0.2.0)
     pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
-    psych (5.2.2)
+    psych (5.2.6)
       date
       stringio
     public_suffix (6.0.1)
     puma (6.5.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.2.0)
     rack-proxy (0.7.7)
       rack
-    rack-session (2.0.0)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (8.0.1)
+    rails (8.0.2.1)
-      actioncable (= 8.0.1)
+      actioncable (= 8.0.2.1)
-      actionmailbox (= 8.0.1)
+      actionmailbox (= 8.0.2.1)
-      actionmailer (= 8.0.1)
+      actionmailer (= 8.0.2.1)
-      actionpack (= 8.0.1)
+      actionpack (= 8.0.2.1)
-      actiontext (= 8.0.1)
+      actiontext (= 8.0.2.1)
-      actionview (= 8.0.1)
+      actionview (= 8.0.2.1)
-      activejob (= 8.0.1)
+      activejob (= 8.0.2.1)
-      activemodel (= 8.0.1)
+      activemodel (= 8.0.2.1)
-      activerecord (= 8.0.1)
+      activerecord (= 8.0.2.1)
-      activestorage (= 8.0.1)
+      activestorage (= 8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       bundler (>= 1.15.0)
-      railties (= 8.0.1)
+      railties (= 8.0.2.1)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -424,22 +430,23 @@ GEM
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (8.0.1)
+    railties (8.0.2.1)
-      actionpack (= 8.0.1)
+      actionpack (= 8.0.2.1)
-      activesupport (= 8.0.1)
+      activesupport (= 8.0.2.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
-    rdoc (6.10.0)
+    rdoc (6.14.2)
+      erb
       psych (>= 4.0.0)
     redis-client (0.23.0)
       connection_pool
     regexp_parser (2.9.3)
-    reline (0.6.0)
+    reline (0.6.2)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -538,10 +545,10 @@ GEM
     sqlite3 (2.5.0-arm64-darwin)
     sqlite3 (2.5.0-x86_64-linux-gnu)
     sqlite3 (2.5.0-x86_64-linux-musl)
-    stringio (3.1.2)
+    stringio (3.1.7)
     strip_attributes (1.14.1)
       activemodel (>= 3.0, < 9.0)
-    thor (1.3.2)
+    thor (1.4.0)
     timeout (0.4.3)
     trailblazer-option (0.1.2)
     turbo-rails (2.0.11)
@@ -574,12 +581,13 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
-    websocket-driver (0.7.6)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.1)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   aarch64-linux

app/controllers/accounts_controller.rb

@@ -27,7 +27,7 @@ class AccountsController < ApplicationController
       unless URI.parse(@encrypted_config.value.to_s).class.in?([URI::HTTP, URI::HTTPS])
         @encrypted_config.errors.add(:value, I18n.t('should_be_a_valid_url'))
 
-        return render :show, status: :unprocessable_entity
+        return render :show, status: :unprocessable_content
       end
 
       @encrypted_config.save!
@@ -39,7 +39,7 @@ class AccountsController < ApplicationController
       redirect_to settings_account_path, notice: I18n.t('account_information_has_been_updated')
     end
   rescue ActiveRecord::RecordInvalid
-    render :show, status: :unprocessable_entity
+    render :show, status: :unprocessable_content
   end
 
   def destroy

app/controllers/api/api_base_controller.rb

@@ -16,7 +16,7 @@ module Api
     check_authorization
 
     rescue_from Params::BaseValidator::InvalidParameterError do |e|
-      render json: { error: e.message }, status: :unprocessable_entity
+      render json: { error: e.message }, status: :unprocessable_content
     end
 
     rescue_from RateLimit::LimitApproached do |e|
@@ -33,7 +33,7 @@ module Api
       rescue_from JSON::ParserError do |e|
         Rollbar.warning(e) if defined?(Rollbar)
 
-        render json: { error: "JSON parse error: #{e.message}" }, status: :unprocessable_entity
+        render json: { error: "JSON parse error: #{e.message}" }, status: :unprocessable_content
       end
     end
 

app/controllers/api/attachments_controller.rb

@@ -10,10 +10,21 @@ module Api
     def create
       submitter = Submitter.find_by!(slug: params[:submitter_slug])
 
-      if params[:type].in?(%w[initials signature]) && ImageUtils.blank?(Vips::Image.new_from_file(params[:file].path))
+      if params[:type].in?(%w[initials signature])
-        Rollbar.error("Empty signature: #{submitter.id}") if defined?(Rollbar)
+        image = Vips::Image.new_from_file(params[:file].path)
 
-        return render json: { error: "#{params[:type]} is empty" }, status: :unprocessable_entity
+        if ImageUtils.blank?(image)
+          Rollbar.error("Empty signature: #{submitter.id}") if defined?(Rollbar)
+
+          return render json: { error: "#{params[:type]} is empty" }, status: :unprocessable_content
+        end
+
+        if ImageUtils.error?(image)
+          Rollbar.error("Error signature: #{submitter.id}") if defined?(Rollbar)
+
+          return render json: { error: "#{params[:type]} error, try to sign on another device" },
+                        status: :unprocessable_content
+        end
       end
 
       attachment = Submitters.create_attachment!(submitter, params)

app/controllers/api/submissions_controller.rb

@@ -50,12 +50,12 @@ module Api
     def create
       Params::SubmissionCreateValidator.call(params)
 
-      return render json: { error: 'Template not found' }, status: :unprocessable_entity if @template.nil?
+      return render json: { error: 'Template not found' }, status: :unprocessable_content if @template.nil?
 
       if @template.fields.blank?
         Rollbar.warning("Template does not contain fields: #{@template.id}") if defined?(Rollbar)
 
-        return render json: { error: 'Template does not contain fields' }, status: :unprocessable_entity
+        return render json: { error: 'Template does not contain fields' }, status: :unprocessable_content
       end
 
       params[:send_email] = true unless params.key?(:send_email)
@@ -82,7 +82,7 @@ module Api
            DownloadUtils::UnableToDownload => e
       Rollbar.warning(e) if defined?(Rollbar)
 
-      render json: { error: e.message }, status: :unprocessable_entity
+      render json: { error: e.message }, status: :unprocessable_content
     end
 
     def destroy
@@ -185,7 +185,7 @@ module Api
           message: %i[subject body],
           submitters: [[:send_email, :send_sms, :completed_redirect_url, :uuid, :name, :email, :role,
                         :completed, :phone, :application_key, :external_id, :reply_to, :go_to_last,
-                        :require_phone_2fa,
+                        :require_phone_2fa, :order,
                         { metadata: {}, values: {}, roles: [], readonly_fields: [], message: %i[subject body],
                           fields: [:name, :uuid, :default_value, :value, :title, :description,
                                    :readonly, :required, :validation_pattern, :invalid_message,

app/controllers/api/submitters_controller.rb

@@ -34,7 +34,7 @@ module Api
 
     def update
       if @submitter.completed_at?
-        return render json: { error: 'Submitter has already completed the submission.' }, status: :unprocessable_entity
+        return render json: { error: 'Submitter has already completed the submission.' }, status: :unprocessable_content
       end
 
       submission = @submitter.submission
@@ -74,7 +74,7 @@ module Api
     rescue Submitters::NormalizeValues::BaseError, DownloadUtils::UnableToDownload => e
       Rollbar.warning(e) if defined?(Rollbar)
 
-      render json: { error: e.message }, status: :unprocessable_entity
+      render json: { error: e.message }, status: :unprocessable_content
     end
 
     def submitter_params

app/controllers/api/templates_controller.rb

@@ -106,10 +106,10 @@ module Api
         :external_id,
         :shared_link,
         {
-          submitters: [%i[name uuid is_requester invite_by_uuid optional_invite_by_uuid linked_to_uuid email]],
+          submitters: [%i[name uuid is_requester invite_by_uuid optional_invite_by_uuid linked_to_uuid email order]],
           fields: [[:uuid, :submitter_uuid, :name, :type,
                     :required, :readonly, :default_value,
-                    :title, :description,
+                    :title, :description, :prefillable,
                     { preferences: {},
                       conditions: [%i[field_uuid value action operation]],
                       options: [%i[value uuid]],

app/controllers/api/tools_controller.rb

@@ -7,8 +7,8 @@ module Api
     def merge
       files = params[:files] || []
 
-      return render json: { error: 'Files are required' }, status: :unprocessable_entity if files.blank?
+      return render json: { error: 'Files are required' }, status: :unprocessable_content if files.blank?
-      return render json: { error: 'At least 2 files are required' }, status: :unprocessable_entity if files.size < 2
+      return render json: { error: 'At least 2 files are required' }, status: :unprocessable_content if files.size < 2
 
       render json: {
         data: Base64.encode64(PdfUtils.merge(files.map { |base64| StringIO.new(Base64.decode64(base64)) }).string)
@@ -35,7 +35,7 @@ module Api
         end
       }
     rescue HexaPDF::MalformedPDFError
-      render json: { error: 'Malformed PDF' }, status: :unprocessable_entity
+      render json: { error: 'Malformed PDF' }, status: :unprocessable_content
     end
   end
 end

app/controllers/email_smtp_settings_controller.rb

@@ -15,12 +15,12 @@ class EmailSmtpSettingsController < ApplicationController
 
       redirect_to settings_email_index_path, notice: I18n.t('changes_have_been_saved')
     else
-      render :index, status: :unprocessable_entity
+      render :index, status: :unprocessable_content
     end
   rescue StandardError => e
     flash[:alert] = e.message
 
-    render :index, status: :unprocessable_entity
+    render :index, status: :unprocessable_content
   end
 
   private

app/controllers/esign_settings_controller.rb

@@ -53,7 +53,7 @@ class EsignSettingsController < ApplicationController
       @cert_record.errors.add(:name, I18n.t('already_exists'))
 
       return render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'),
-                    status: :unprocessable_entity
+                    status: :unprocessable_content
     end
 
     save_new_cert!(@encrypted_config, @cert_record)
@@ -64,7 +64,7 @@ class EsignSettingsController < ApplicationController
 
     @cert_record.errors.add(:password, e.message)
 
-    render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'), status: :unprocessable_entity
+    render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'), status: :unprocessable_content
   end
 
   def update

app/controllers/mfa_setup_controller.rb

@@ -24,7 +24,7 @@ class MfaSetupController < ApplicationController
 
       @error_message = I18n.t('code_is_invalid')
 
-      render turbo_stream: turbo_stream.replace(:mfa_form, partial: 'mfa_setup/form'), status: :unprocessable_entity
+      render turbo_stream: turbo_stream.replace(:mfa_form, partial: 'mfa_setup/form'), status: :unprocessable_content
     end
   end
 
@@ -36,7 +36,7 @@ class MfaSetupController < ApplicationController
     else
       @error_message = I18n.t('code_is_invalid')
 
-      render turbo_stream: turbo_stream.replace(:modal, template: 'mfa_setup/edit'), status: :unprocessable_entity
+      render turbo_stream: turbo_stream.replace(:modal, template: 'mfa_setup/edit'), status: :unprocessable_content
     end
   end
 

app/controllers/profile_controller.rb

@@ -11,7 +11,7 @@ class ProfileController < ApplicationController
     if current_user.update(contact_params)
       redirect_to settings_profile_index_path, notice: I18n.t('contact_information_has_been_update')
     else
-      render :index, status: :unprocessable_entity
+      render :index, status: :unprocessable_content
     end
   end
 
@@ -20,7 +20,7 @@ class ProfileController < ApplicationController
       bypass_sign_in(current_user)
       redirect_to settings_profile_index_path, notice: I18n.t('password_has_been_changed')
     else
-      render :index, status: :unprocessable_entity
+      render :index, status: :unprocessable_content
     end
   end
 

app/controllers/sessions_controller.rb

@@ -16,7 +16,7 @@ class SessionsController < Devise::SessionsController
     end
 
     if User.exists?(email:, otp_required_for_login: true) && sign_in_params[:otp_attempt].blank?
-      return render :otp, locals: { resource: User.new(sign_in_params) }, status: :unprocessable_entity
+      return render :otp, locals: { resource: User.new(sign_in_params) }, status: :unprocessable_content
     end
 
     super

app/controllers/setup_controller.rb

@@ -23,10 +23,10 @@ class SetupController < ApplicationController
     unless URI.parse(encrypted_config_params[:value].to_s).class.in?([URI::HTTP, URI::HTTPS])
       @encrypted_config.errors.add(:value, I18n.t('should_be_a_valid_url'))
 
-      return render :index, status: :unprocessable_entity
+      return render :index, status: :unprocessable_content
     end
 
-    return render :index, status: :unprocessable_entity unless @account.valid?
+    return render :index, status: :unprocessable_content unless @account.valid?
 
     if @user.save
       encrypted_configs = [
@@ -42,7 +42,7 @@ class SetupController < ApplicationController
 
       redirect_to newsletter_path
     else
-      render :index, status: :unprocessable_entity
+      render :index, status: :unprocessable_content
     end
   end
 

app/controllers/start_form_controller.rb

@@ -42,7 +42,7 @@ class StartFormController < ApplicationController
       if filter_undefined_submitters(@template).size > 1 && @submitter.new_record?
         @error_message = multiple_submitters_error_message
 
-        return render :show, status: :unprocessable_entity
+        return render :show, status: :unprocessable_content
       end
 
       if (is_new_record = @submitter.new_record?)
@@ -60,7 +60,7 @@ class StartFormController < ApplicationController
 
         redirect_to submit_form_path(@submitter.slug)
       else
-        render :show, status: :unprocessable_entity
+        render :show, status: :unprocessable_content
       end
     end
   end
@@ -206,7 +206,7 @@ class StartFormController < ApplicationController
   end
 
   def handle_require_2fa(submitter, is_new_record:)
-    return render :show, status: :unprocessable_entity if submitter.errors.present?
+    return render :show, status: :unprocessable_content if submitter.errors.present?
 
     is_otp_verified = Submitters.verify_link_otp!(params[:one_time_code], submitter)
 
@@ -223,7 +223,7 @@ class StartFormController < ApplicationController
 
         redirect_to submit_form_path(submitter.slug)
       else
-        render :show, status: :unprocessable_entity
+        render :show, status: :unprocessable_content
       end
     else
       Submitters.send_shared_link_email_verification_code(submitter, request:)

app/controllers/storage_settings_controller.rb

@@ -13,7 +13,7 @@ class StorageSettingsController < ApplicationController
 
       redirect_to settings_storage_index_path, notice: I18n.t('changes_have_been_saved')
     else
-      render :index, status: :unprocessable_entity
+      render :index, status: :unprocessable_content
     end
   end
 

app/controllers/submissions_controller.rb

@@ -32,10 +32,7 @@ class SubmissionsController < ApplicationController
   def create
     save_template_message(@template, params) if params[:save_message] == '1'
 
-    if params[:is_custom_message] != '1'
+    [params.delete(:subject), params.delete(:body)] if params[:is_custom_message] != '1'
-      params.delete(:subject)
-      params.delete(:body)
-    end
 
     submissions =
       if params[:emails].present?
@@ -46,11 +43,16 @@ class SubmissionsController < ApplicationController
                                        emails: params[:emails],
                                        params: params.merge('send_completed_email' => true))
       else
+        submissions_attrs = submissions_params[:submission].to_h.values
+
+        submissions_attrs, =
+          Submissions::NormalizeParamUtils.normalize_submissions_params!(submissions_attrs, @template)
+
         Submissions.create_from_submitters(template: @template,
                                            user: current_user,
                                            source: :invite,
                                            submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random',
-                                           submissions_attrs: submissions_params[:submission].to_h.values,
+                                           submissions_attrs:,
                                            params: params.merge('send_completed_email' => true))
       end
 
@@ -62,10 +64,9 @@ class SubmissionsController < ApplicationController
 
     redirect_to template_path(@template), notice: I18n.t('new_recipients_have_been_added')
   rescue Submissions::CreateFromSubmitters::BaseError => e
-    render turbo_stream: turbo_stream.replace(:submitters_error,
+    render turbo_stream: turbo_stream.replace(:submitters_error, partial: 'submissions/error',
-                                              partial: 'submissions/error',
+                                                                 locals: { error: e.message }),
-                                              locals: { error: e.message }),
+           status: :unprocessable_content
-           status: :unprocessable_entity
   end
 
   def destroy
@@ -95,7 +96,7 @@ class SubmissionsController < ApplicationController
   end
 
   def submissions_params
-    params.permit(submission: { submitters: [%i[uuid email phone name]] })
+    params.permit(submission: { submitters: [:uuid, :email, :phone, :name, { values: {} }] })
   end
 
   def load_template

app/controllers/submit_form_controller.rb

@@ -48,20 +48,20 @@ class SubmitFormController < ApplicationController
 
   def update
     if @submitter.completed_at?
-      return render json: { error: I18n.t('form_has_been_completed_already') }, status: :unprocessable_entity
+      return render json: { error: I18n.t('form_has_been_completed_already') }, status: :unprocessable_content
     end
 
     if @submitter.submission.template&.archived_at? || @submitter.submission.archived_at?
-      return render json: { error: I18n.t('form_has_been_archived') }, status: :unprocessable_entity
+      return render json: { error: I18n.t('form_has_been_archived') }, status: :unprocessable_content
     end
 
     if @submitter.submission.expired?
-      return render json: { error: I18n.t('form_has_been_expired') }, status: :unprocessable_entity
+      return render json: { error: I18n.t('form_has_been_expired') }, status: :unprocessable_content
     end
 
     if @submitter.declined_at?
       return render json: { error: I18n.t('form_has_been_declined') },
-                    status: :unprocessable_entity
+                    status: :unprocessable_content
     end
 
     Submitters::SubmitValues.call(@submitter, params, request)
@@ -70,9 +70,9 @@ class SubmitFormController < ApplicationController
   rescue Submitters::SubmitValues::RequiredFieldError => e
     Rollbar.warning("Required field #{@submitter.id}: #{e.message}") if defined?(Rollbar)
 
-    render json: { field_uuid: e.message }, status: :unprocessable_entity
+    render json: { field_uuid: e.message }, status: :unprocessable_content
   rescue Submitters::SubmitValues::ValidationError => e
-    render json: { error: e.message }, status: :unprocessable_entity
+    render json: { error: e.message }, status: :unprocessable_content
   end
 
   def completed; end

app/controllers/submit_form_download_controller.rb

@@ -11,13 +11,13 @@ class SubmitFormDownloadController < ApplicationController
 
     return redirect_to submitter_download_index_path(@submitter.slug) if @submitter.completed_at?
 
-    return head :unprocessable_entity if @submitter.declined_at? ||
+    return head :unprocessable_content if @submitter.declined_at? ||
-                                         @submitter.submission.archived_at? ||
+                                          @submitter.submission.archived_at? ||
-                                         @submitter.submission.expired? ||
+                                          @submitter.submission.expired? ||
-                                         @submitter.submission.template&.archived_at? ||
+                                          @submitter.submission.template&.archived_at? ||
-                                         AccountConfig.exists?(account_id: @submitter.account_id,
+                                          AccountConfig.exists?(account_id: @submitter.account_id,
-                                                               key: AccountConfig::ALLOW_TO_PARTIAL_DOWNLOAD_KEY,
+                                                                key: AccountConfig::ALLOW_TO_PARTIAL_DOWNLOAD_KEY,
-                                                               value: false)
+                                                                value: false)
 
     last_completed_submitter = @submitter.submission.submitters
                                          .where.not(id: @submitter.id)

app/controllers/submit_form_invite_controller.rb

@@ -7,7 +7,7 @@ class SubmitFormInviteController < ApplicationController
   def create
     submitter = Submitter.find_by!(slug: params[:submit_form_slug])
 
-    return head :unprocessable_entity unless can_invite?(submitter)
+    return head :unprocessable_content unless can_invite?(submitter)
 
     invite_submitters = filter_invite_submitters(submitter, 'invite_by_uuid')
     optional_invite_submitters = filter_invite_submitters(submitter, 'optional_invite_by_uuid')
@@ -34,7 +34,7 @@ class SubmitFormInviteController < ApplicationController
 
       head :ok
     else
-      head :unprocessable_entity
+      head :unprocessable_content
     end
   end
 

app/controllers/template_documents_controller.rb

@@ -5,7 +5,7 @@ class TemplateDocumentsController < ApplicationController
 
   def create
     if params[:blobs].blank? && params[:files].blank?
-      return render json: { error: I18n.t('file_is_missing') }, status: :unprocessable_entity
+      return render json: { error: I18n.t('file_is_missing') }, status: :unprocessable_content
     end
 
     old_fields_hash = @template.fields.hash
@@ -28,6 +28,6 @@ class TemplateDocumentsController < ApplicationController
       )
     }
   rescue Templates::CreateAttachments::PdfEncrypted
-    render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_entity
+    render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_content
   end
 end

app/controllers/templates_clone_and_replace_controller.rb

@@ -4,7 +4,7 @@ class TemplatesCloneAndReplaceController < ApplicationController
   load_and_authorize_resource :template
 
   def create
-    return head :unprocessable_entity if params[:files].blank?
+    return head :unprocessable_content if params[:files].blank?
 
     ActiveRecord::Associations::Preloader.new(
       records: [@template],
@@ -31,7 +31,7 @@ class TemplatesCloneAndReplaceController < ApplicationController
   rescue Templates::CreateAttachments::PdfEncrypted
     respond_to do |f|
       f.html { render turbo_stream: turbo_stream.append(params[:form_id], html: helpers.tag.prompt_password) }
-      f.json { render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_entity }
+      f.json { render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_content }
     end
   end
 end

app/controllers/templates_controller.rb

@@ -78,7 +78,7 @@ class TemplatesController < ApplicationController
 
       maybe_redirect_to_template(@template)
     else
-      render turbo_stream: turbo_stream.replace(:modal, template: 'templates/new'), status: :unprocessable_entity
+      render turbo_stream: turbo_stream.replace(:modal, template: 'templates/new'), status: :unprocessable_content
     end
   end
 
@@ -117,10 +117,10 @@ class TemplatesController < ApplicationController
     params.require(:template).permit(
       :name,
       { schema: [[:attachment_uuid, :name, { conditions: [%i[field_uuid value action operation]] }]],
-        submitters: [%i[name uuid is_requester linked_to_uuid invite_by_uuid optional_invite_by_uuid email]],
+        submitters: [%i[name uuid is_requester linked_to_uuid invite_by_uuid optional_invite_by_uuid email order]],
         fields: [[:uuid, :submitter_uuid, :name, :type,
                   :required, :readonly, :default_value,
-                  :title, :description,
+                  :title, :description, :prefillable,
                   { preferences: {},
                     conditions: [%i[field_uuid value action operation]],
                     options: [%i[value uuid]],

app/controllers/templates_debug_controller.rb

@@ -3,6 +3,8 @@
 class TemplatesDebugController < ApplicationController
   load_and_authorize_resource :template
 
+  DEBUG_FILE = ''
+
   def show
     attachment = @template.documents.first
 
@@ -16,6 +18,8 @@ class TemplatesDebugController < ApplicationController
 
     @template.update!(fields: Templates::ProcessDocument.normalize_attachment_fields(@template, [attachment]))
 
+    debug_file if DEBUG_FILE.present?
+
     ActiveRecord::Associations::Preloader.new(
       records: [@template],
       associations: [schema_documents: { preview_images_attachments: :blob }]
@@ -31,4 +35,27 @@ class TemplatesDebugController < ApplicationController
 
     render 'templates/edit', layout: 'plain'
   end
+
+  def debug_file
+    tempfile = Tempfile.new
+    tempfile.binmode
+    tempfile.write(File.read(DEBUG_FILE))
+    tempfile.rewind
+
+    filename = File.basename(DEBUG_FILE)
+
+    file = ActionDispatch::Http::UploadedFile.new(
+      tempfile:,
+      filename:,
+      type: Marcel::MimeType.for(tempfile)
+    )
+
+    params = { files: [file] }
+
+    documents = Templates::CreateAttachments.call(@template, params)
+
+    schema = documents.map { |doc| { attachment_uuid: doc.uuid, name: doc.filename.base } }
+
+    @template.update!(schema:)
+  end
 end

app/controllers/templates_preferences_controller.rb

@@ -27,7 +27,7 @@ class TemplatesPreferencesController < ApplicationController
                       completed_redirect_url validate_unique_submitters
                       require_all_submitters submitters_order require_phone_2fa
                       default_expire_at_duration shared_link_2fa
-                      default_expire_at
+                      default_expire_at request_email_enabled
                       completed_notification_email_subject completed_notification_email_body
                       completed_notification_email_enabled completed_notification_email_attach_audit] +
                       [completed_message: %i[title body],

app/controllers/templates_prefillable_fields_controller.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class TemplatesPrefillableFieldsController < ApplicationController
+  PREFILLABLE_FIELD_TYPES = %w[text number cells date checkbox select radio phone].freeze
+
+  load_and_authorize_resource :template
+
+  def create
+    authorize!(:update, @template)
+
+    field = @template.fields.find { |f| f['uuid'] == params[:field_uuid] }
+
+    if params[:prefillable] == 'false'
+      field.delete('prefillable')
+      field.delete('readonly')
+    elsif params[:prefillable] == 'true'
+      field['prefillable'] = true
+      field['readonly'] = true
+    end
+
+    @template.save!
+
+    render turbo_stream: turbo_stream.replace(:prefillable_fields_list, partial: 'list',
+                                                                        locals: { template: @template })
+  end
+end

app/controllers/templates_recipients_controller.rb

@@ -9,6 +9,10 @@ class TemplatesRecipientsController < ApplicationController
     @template.submitters =
       submitters_params.map { |s| s.reject { |_, v| v.is_a?(String) && v.blank? } }
 
+    if @template.submitters.each_with_index.all? { |s, index| s['order'] == index }
+      @template.submitters.each { |s| s.delete('order') }
+    end
+
     @template.save!
 
     render json: { submitters: @template.submitters }
@@ -18,7 +22,7 @@ class TemplatesRecipientsController < ApplicationController
 
   def submitters_params
     permit_params = { submitters: [%i[name uuid is_requester optional_invite_by_uuid
-                                      invite_by_uuid linked_to_uuid email option]] }
+                                      invite_by_uuid linked_to_uuid email option order]] }
 
     params.require(:template).permit(permit_params).fetch(:submitters, {}).values.filter_map do |s|
       next if s[:uuid].blank?
@@ -29,6 +33,7 @@ class TemplatesRecipientsController < ApplicationController
         s.delete(:is_requester)
       end
 
+      s[:order] = s[:order].to_i if s[:order].present?
       s.delete(:invite_by_uuid) if s[:invite_by_uuid].blank?
       s.delete(:optional_invite_by_uuid) if s[:optional_invite_by_uuid].blank?
 

app/controllers/users_controller.rb

@@ -27,7 +27,7 @@ class UsersController < ApplicationController
     if User.accessible_by(current_ability).exists?(email: @user.email)
       @user.errors.add(:email, I18n.t('already_exists'))
 
-      return render turbo_stream: turbo_stream.replace(:modal, template: 'users/new'), status: :unprocessable_entity
+      return render turbo_stream: turbo_stream.replace(:modal, template: 'users/new'), status: :unprocessable_content
     end
 
     @user.role = User::ADMIN_ROLE unless role_valid?(@user.role)
@@ -37,7 +37,7 @@ class UsersController < ApplicationController
 
       redirect_back fallback_location: settings_users_path, notice: I18n.t('user_has_been_invited')
     else
-      render turbo_stream: turbo_stream.replace(:modal, template: 'users/new'), status: :unprocessable_entity
+      render turbo_stream: turbo_stream.replace(:modal, template: 'users/new'), status: :unprocessable_content
     end
   end
 
@@ -57,7 +57,7 @@ class UsersController < ApplicationController
     if @user.update(attrs.except(current_user == @user ? :role : nil))
       redirect_back fallback_location: settings_users_path, notice: I18n.t('user_has_been_updated')
     else
-      render turbo_stream: turbo_stream.replace(:modal, template: 'users/edit'), status: :unprocessable_entity
+      render turbo_stream: turbo_stream.replace(:modal, template: 'users/edit'), status: :unprocessable_content
     end
   end
 

app/javascript/application.js

@@ -37,6 +37,8 @@ import AppTour from './elements/app_tour'
 import DashboardDropzone from './elements/dashboard_dropzone'
 import RequiredCheckboxGroup from './elements/required_checkbox_group'
 import PageContainer from './elements/page_container'
+import EmailEditor from './elements/email_editor'
+import MountOnClick from './elements/mount_on_click'
 
 import * as TurboInstantClick from './lib/turbo_instant_click'
 
@@ -109,6 +111,8 @@ safeRegisterElement('dashboard-dropzone', DashboardDropzone)
 safeRegisterElement('check-on-click', CheckOnClick)
 safeRegisterElement('required-checkbox-group', RequiredCheckboxGroup)
 safeRegisterElement('page-container', PageContainer)
+safeRegisterElement('email-editor', EmailEditor)
+safeRegisterElement('mount-on-click', MountOnClick)
 
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {

app/javascript/elements/email_editor.js

@@ -0,0 +1,131 @@
+import { target, targetable } from '@github/catalyst/lib/targetable'
+
+let loaderPromise = null
+
+function loadCodeMirror () {
+  if (!loaderPromise) {
+    loaderPromise = Promise.all([
+      import(/* webpackChunkName: "email-editor" */ '@codemirror/view'),
+      import(/* webpackChunkName: "email-editor" */ '@codemirror/commands'),
+      import(/* webpackChunkName: "email-editor" */ '@codemirror/language'),
+      import(/* webpackChunkName: "email-editor" */ '@codemirror/lang-html'),
+      import(/* webpackChunkName: "email-editor" */ '@specious/htmlflow')
+    ]).then(([view, commands, language, html, htmlflow]) => {
+      return {
+        minimalSetup: [
+          commands.history(),
+          language.syntaxHighlighting(language.defaultHighlightStyle, { fallback: true }),
+          view.keymap.of([...commands.defaultKeymap, ...commands.historyKeymap])
+        ],
+        EditorView: view.EditorView,
+        html: html.html,
+        htmlflow: htmlflow.default || htmlflow
+      }
+    })
+  }
+
+  return loaderPromise
+}
+
+export default targetable(class extends HTMLElement {
+  static [target.static] = [
+    'codeViewTab',
+    'previewViewTab',
+    'editorContainer',
+    'previewIframe'
+  ]
+
+  connectedCallback () {
+    this.mount()
+
+    if (this.input.value) {
+      this.showPreviewView()
+    } else {
+      this.showCodeView()
+    }
+
+    this.previewViewTab.addEventListener('click', this.showPreviewView)
+    this.codeViewTab.addEventListener('click', this.showCodeView)
+  }
+
+  showCodeView = () => {
+    this.editorView.dispatch({
+      changes: { from: 0, to: this.editorView.state.doc.length, insert: this.input.value }
+    })
+
+    this.previewViewTab.classList.remove('tab-active', 'tab-bordered')
+    this.previewViewTab.classList.add('pb-[3px]')
+    this.codeViewTab.classList.remove('pb-[3px]')
+    this.codeViewTab.classList.add('tab-active', 'tab-bordered')
+    this.editorContainer.classList.remove('hidden')
+    this.previewIframe.classList.add('hidden')
+  }
+
+  showPreviewView = () => {
+    this.previewIframe.srcdoc = this.input.value
+
+    this.codeViewTab.classList.remove('tab-active', 'tab-bordered')
+    this.codeViewTab.classList.add('pb-[3px]')
+    this.previewViewTab.classList.remove('pb-[3px]')
+    this.previewViewTab.classList.add('tab-active', 'tab-bordered')
+    this.editorContainer.classList.add('hidden')
+    this.previewIframe.classList.remove('hidden')
+  }
+
+  async mount () {
+    this.input = this.querySelector('input[type="hidden"]')
+    this.input.style.display = 'none'
+
+    const { EditorView, minimalSetup, html, htmlflow } = await loadCodeMirror()
+
+    this.editorView = new EditorView({
+      doc: this.input.value,
+      parent: this.editorContainer,
+      extensions: [
+        html(),
+        minimalSetup,
+        EditorView.lineWrapping,
+        EditorView.updateListener.of(update => {
+          if (update.docChanged) this.input.value = update.state.doc.toString()
+        }),
+        EditorView.theme({
+          '&': {
+            backgroundColor: 'white',
+            color: 'black',
+            fontSize: '14px',
+            fontFamily: 'monospace'
+          },
+          '&.cm-focused': {
+            outline: 'none'
+          },
+          '&.cm-editor': {
+            borderRadius: '0.375rem',
+            border: 'none'
+          },
+          '.cm-gutters': {
+            display: 'none'
+          }
+        })
+      ]
+    })
+
+    this.previewIframe.srcdoc = this.editorView.state.doc.toString()
+
+    this.previewIframe.onload = () => {
+      const previewIframeDoc = this.previewIframe.contentDocument
+
+      if (previewIframeDoc.body) {
+        previewIframeDoc.body.contentEditable = true
+      }
+
+      const contentDocument = this.previewIframe.contentDocument || this.previewIframe.contentWindow.document
+
+      contentDocument.body.addEventListener('input', async () => {
+        const html = contentDocument.documentElement.outerHTML.replace(' contenteditable="true"', '')
+        const prettifiedHtml = await htmlflow(html)
+
+        this.input.value = prettifiedHtml
+      })
+    }
+  }
+})

app/javascript/elements/mount_on_click.js

@@ -0,0 +1,11 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.addEventListener('click', () => {
+      document.body.append(this.template.content)
+    })
+  }
+
+  get template () {
+    return document.getElementById(this.dataset.templateId)
+  }
+}

app/javascript/elements/toggle_visible.js

@@ -7,5 +7,9 @@ export default actionable(class extends HTMLElement {
     elementIds.forEach((elementId) => {
       document.getElementById(elementId).classList.toggle('hidden', (event.target.dataset.toggleId || event.target.value) !== elementId)
     })
+
+    if (this.dataset.focusId) {
+      document.getElementById(this.dataset.focusId)?.focus()
+    }
   }
 })

app/javascript/submission_form/dropzone.vue

@@ -112,11 +112,23 @@ export default {
     onSelectFiles (e) {
       e.preventDefault()
 
-      this.uploadFiles(this.$refs.input.files).then(() => {
+      const files = Array.from(this.$refs.input.files).filter((f) => {
-        if (this.$refs.input) {
+        if (this.accept === 'image/*') {
-          this.$refs.input.value = ''
+          return f.type.startsWith('image')
+        } else {
+          return true
         }
       })
+
+      if (this.accept === 'image/*' && !files.length) {
+        alert(this.t('please_upload_an_image_file'))
+      } else {
+        this.uploadFiles(files).then(() => {
+          if (this.$refs.input) {
+            this.$refs.input.value = ''
+          }
+        })
+      }
     },
     async uploadFiles (files) {
       this.isLoading = true

app/javascript/submission_form/signature_step.vue

@@ -21,7 +21,7 @@
       </label>
       <div class="space-x-2 flex flex-none">
         <span
-          v-if="isTextSignature && format !== 'typed' && format !== 'upload'"
+          v-if="isTextSignature && format !== 'typed_or_upload' && format !== 'typed' && format !== 'upload'"
           class="tooltip"
           :data-tip="t('draw_signature')"
         >
@@ -38,7 +38,7 @@
           </a>
         </span>
         <span
-          v-else-if="withTypedSignature && format !== 'typed' && format !== 'drawn' && format !== 'upload'"
+          v-else-if="withTypedSignature && format !== 'drawn_or_upload' && format !== 'typed_or_upload' && format !== 'typed' && format !== 'drawn' && format !== 'upload'"
           class="tooltip ml-2"
           :class="{ 'hidden sm:inline': modelValue || computedPreviousValue }"
           :data-tip="t('type_text')"
@@ -85,8 +85,8 @@
           {{ t(format === 'upload' ? 'reupload' : 'redraw') }}
         </a>
         <span
-          v-if="withQrButton && !modelValue && !computedPreviousValue && format !== 'typed' && format !== 'upload'"
+          v-if="withQrButton && !modelValue && !computedPreviousValue && format !== 'typed_or_upload' && format !== 'typed' && format !== 'upload'"
-          class=" tooltip"
+          class="tooltip before:translate-x-[-90%]"
           :data-tip="t('drawn_signature_on_a_touchscreen_device')"
         >
           <a
@@ -395,7 +395,7 @@ export default {
       isShowQr: false,
       isOtherReason: false,
       isUsePreviousValue: true,
-      isTextSignature: this.field.preferences?.format === 'typed',
+      isTextSignature: this.field.preferences?.format === 'typed' || this.field.preferences?.format === 'typed_or_upload',
       uploadImageInputKey: Math.random().toString()
     }
   },

app/javascript/template_builder/area.vue

@@ -141,6 +141,7 @@
               :with-required="false"
               :with-areas="false"
               :with-signature-id="withSignatureId"
+              :with-prefillable="withPrefillable"
               @click-formula="isShowFormulaModal = true"
               @click-font="isShowFontModal = true"
               @click-description="isShowDescriptionModal = true"
@@ -353,6 +354,11 @@ export default {
       required: false,
       default: null
     },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     defaultSubmitters: {
       type: Array,
       required: false,

app/javascript/template_builder/builder.vue

@@ -331,6 +331,7 @@
                 :default-fields="[...defaultRequiredFields, ...defaultFields]"
                 :allow-draw="!onlyDefinedFields || drawField"
                 :with-signature-id="withSignatureId"
+                :with-prefillable="withPrefillable"
                 :data-document-uuid="document.uuid"
                 :default-submitters="defaultSubmitters"
                 :drag-field-placeholder="fieldsDragFieldRef.value || dragField"
@@ -438,6 +439,7 @@
             :field-types="fieldTypes"
             :with-sticky-submitters="withStickySubmitters"
             :with-signature-id="withSignatureId"
+            :with-prefillable="withPrefillable"
             :only-defined-fields="onlyDefinedFields"
             :editable="editable"
             :show-tour-start-form="showTourStartForm"
@@ -543,7 +545,6 @@ export default {
       withPayment: this.withPayment,
       isPaymentConnected: this.isPaymentConnected,
       withFormula: this.withFormula,
-      withSignatureId: this.withSignatureId,
       withConditions: this.withConditions,
       isInlineSize: this.isInlineSize,
       defaultDrawFieldType: this.defaultDrawFieldType,
@@ -659,7 +660,7 @@ export default {
     acceptFileTypes: {
       type: String,
       required: false,
-      default: 'image/*, application/pdf'
+      default: 'image/*, application/pdf, application/zip'
     },
     baseUrl: {
       type: String,
@@ -802,6 +803,13 @@ export default {
     language () {
       return this.locale.split('-')[0].toLowerCase()
     },
+    withPrefillable () {
+      if (this.template.fields) {
+        return this.template.fields.some((f) => f.prefillable)
+      } else {
+        return false
+      }
+    },
     isInlineSize () {
       return CSS.supports('container-type: size')
     },

app/javascript/template_builder/controls.vue

@@ -66,7 +66,7 @@ export default {
     acceptFileTypes: {
       type: String,
       required: false,
-      default: 'image/*, application/pdf'
+      default: 'image/*, application/pdf, application/zip'
     },
     withReplaceButton: {
       type: Boolean,

app/javascript/template_builder/document.vue

@@ -11,6 +11,7 @@
       :areas="areasIndex[index]"
       :allow-draw="allowDraw"
       :with-signature-id="withSignatureId"
+      :with-prefillable="withPrefillable"
       :is-drag="isDrag"
       :with-field-placeholder="withFieldPlaceholder"
       :default-fields="defaultFields"
@@ -72,6 +73,11 @@ export default {
       required: false,
       default: null
     },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     drawFieldType: {
       type: String,
       required: false,

app/javascript/template_builder/dropzone.vue

@@ -107,7 +107,7 @@ export default {
     acceptFileTypes: {
       type: String,
       required: false,
-      default: 'image/*, application/pdf'
+      default: 'image/*, application/pdf, application/zip'
     }
   },
   emits: ['success', 'error', 'loading'],
@@ -131,7 +131,7 @@ export default {
     message () {
       if (this.isLoading) {
         return this.t('uploading')
-      } else if (this.acceptFileTypes === 'image/*, application/pdf') {
+      } else if (this.acceptFileTypes === 'image/*, application/pdf, application/zip') {
         return this.title || this.t('add_pdf_documents_or_images')
       } else {
         return this.title || this.t('add_documents_or_images')
@@ -146,7 +146,7 @@ export default {
   methods: {
     upload: Upload.methods.upload,
     onDropFiles (e) {
-      if (this.acceptFileTypes !== 'image/*, application/pdf' || [...e.dataTransfer.files].every((f) => f.type.match(/(?:image\/)|(?:application\/pdf)/))) {
+      if (this.acceptFileTypes !== 'image/*, application/pdf, application/zip' || [...e.dataTransfer.files].every((f) => f.type.match(/(?:image\/)|(?:application\/pdf)|(?:application\/zip)/))) {
         this.$refs.input.files = e.dataTransfer.files
 
         this.upload()

app/javascript/template_builder/field.vue

@@ -126,6 +126,7 @@
                 :default-field="defaultField"
                 :editable="editable"
                 :with-signature-id="withSignatureId"
+                :with-prefillable="withPrefillable"
                 :background-color="dropdownBgColor"
                 @click-formula="isShowFormulaModal = true"
                 @click-font="isShowFontModal = true"
@@ -308,6 +309,11 @@ export default {
       required: false,
       default: null
     },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withOptions: {
       type: Boolean,
       required: false,

app/javascript/template_builder/field_settings.vue

@@ -304,7 +304,7 @@
         {{ t('any') }}
       </option>
       <option
-        v-for="type in ['drawn', 'typed', 'drawn_or_typed', 'upload']"
+        v-for="type in ['drawn', 'typed', 'drawn_or_typed', 'drawn_or_upload', 'upload']"
         :key="type"
         :value="type"
         :selected="field.preferences?.format === type"
@@ -406,6 +406,21 @@
       <span class="label-text">{{ t('read_only') }}</span>
     </label>
   </li>
+  <li
+    v-if="withPrefillable && ['text', 'number', 'cells', 'date', 'checkbox', 'select', 'radio', 'phone'].includes(field['type'])"
+    @click.stop
+  >
+    <label class="cursor-pointer py-1.5">
+      <input
+        v-model="field.prefillable"
+        type="checkbox"
+        :disabled="!editable || (defaultField && [true, false].includes(defaultField.prefillable))"
+        class="toggle toggle-xs"
+        @update:model-value="save"
+      >
+      <span class="label-text">{{ t('prefillable') }}</span>
+    </label>
+  </li>
   <hr
     v-if="field.type != 'stamp'"
     class="pb-0.5 mt-0.5"
@@ -555,6 +570,11 @@ export default {
       required: false,
       default: null
     },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withRequired: {
       type: Boolean,
       required: false,

app/javascript/template_builder/fields.vue

@@ -27,6 +27,7 @@
       :type-index="fields.filter((f) => f.type === field.type).indexOf(field)"
       :editable="editable"
       :with-signature-id="withSignatureId"
+      :with-prefillable="withPrefillable"
       :default-field="defaultFieldsIndex[field.name]"
       :draggable="editable"
       @dragstart="[fieldsDragFieldRef.value = field, removeDragOverlay($event), setDragPlaceholder($event)]"
@@ -259,6 +260,11 @@ export default {
       required: false,
       default: null
     },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     template: {
       type: Object,
       required: true

app/javascript/template_builder/hover_dropzone.vue

@@ -2,6 +2,8 @@
   <div
     v-if="isDragging || isLoading"
     class="modal modal-open"
+    @dragover.prevent
+    @drop.prevent="$emit('error')"
   >
     <div class="flex flex-col gap-2 p-4 items-center bg-base-100 h-full max-h-[85vh] max-w-6xl rounded-2xl w-full">
       <Dropzone
@@ -76,7 +78,7 @@ export default {
     acceptFileTypes: {
       type: String,
       required: false,
-      default: 'image/*, application/pdf'
+      default: 'image/*, application/pdf, application/zip'
     }
   },
   emits: ['add', 'replace', 'replace-and-clone', 'error'],

app/javascript/template_builder/i18n.js

@@ -1,4 +1,5 @@
 const en = {
+  prefillable: 'Prefillable',
   signature_id: 'Signature ID',
   error_message: 'Error message',
   length: 'Length',
@@ -59,6 +60,7 @@ const en = {
   any: 'Any',
   drawn: 'Drawn',
   drawn_or_typed: 'Drawn or Typed',
+  drawn_or_upload: 'Drawn or Upload',
   upload: 'Upload',
   formula: 'Formula',
   typed: 'Typed',
@@ -173,6 +175,7 @@ const en = {
 }
 
 const es = {
+  prefillable: 'Rellenable',
   signature_id: 'ID de Firma',
   error_message: 'Mensaje de error',
   length: 'Longitud',
@@ -320,6 +323,7 @@ const es = {
   any: 'Cualquier',
   drawn: 'Dibujado',
   drawn_or_typed: 'Dibujado o Escrito',
+  drawn_or_upload: 'Dibujado o Subido',
   upload: 'Subir',
   typed: 'Escrito',
   none: 'Ninguno',
@@ -347,6 +351,7 @@ const es = {
 }
 
 const it = {
+  prefillable: 'Precompilabile',
   signature_id: 'ID firma',
   error_message: 'Messaggio di errore',
   length: 'Lunghezza',
@@ -407,6 +412,7 @@ const it = {
   any: 'Qualsiasi',
   drawn: 'Disegnato',
   drawn_or_typed: 'Disegnato o Digitato',
+  drawn_or_upload: 'Disegnato o Caricato',
   upload: 'Caricare',
   formula: 'Formula',
   typed: 'Digitato',
@@ -521,6 +527,7 @@ const it = {
 }
 
 const pt = {
+  prefillable: 'Pré-preenchível',
   signature_id: 'ID da Assinatura',
   error_message: 'Mensagem de erro',
   length: 'Comprimento',
@@ -668,6 +675,7 @@ const pt = {
   any: 'Qualquer',
   drawn: 'Desenhado',
   drawn_or_typed: 'Desenhado ou Digitado',
+  drawn_or_upload: 'Desenhado ou Enviado',
   upload: 'Carregar',
   typed: 'Digitado',
   none: 'Nenhum',
@@ -695,6 +703,7 @@ const pt = {
 }
 
 const fr = {
+  prefillable: 'Pré-remplissable',
   signature_id: 'ID de signature',
   error_message: 'Message d\'erreur',
   length: 'Longueur',
@@ -842,6 +851,7 @@ const fr = {
   any: 'Tout',
   drawn: 'Dessiné',
   drawn_or_typed: 'Dessiné ou Tapé',
+  drawn_or_upload: 'Dessiné ou Téléchargé',
   upload: 'Téléverser',
   typed: 'Tapé',
   none: 'Aucun',
@@ -869,6 +879,7 @@ const fr = {
 }
 
 const de = {
+  prefillable: 'Vorausfüllbar',
   signature_id: 'Signatur-ID',
   error_message: 'Fehlermeldung',
   length: 'Länge',
@@ -1016,6 +1027,7 @@ const de = {
   any: 'Jede',
   drawn: 'Gezeichnet',
   drawn_or_typed: 'Gezeichnet oder getippt',
+  drawn_or_upload: 'Gezeichnet oder hochgeladen',
   upload: 'Upload',
   typed: 'Getippt',
   none: 'Keine',

app/javascript/template_builder/page.vue

@@ -28,6 +28,7 @@
         :editable="editable"
         :with-field-placeholder="withFieldPlaceholder"
         :with-signature-id="withSignatureId"
+        :with-prefillable="withPrefillable"
         :default-field="defaultFieldsIndex[item.field.name]"
         :default-submitters="defaultSubmitters"
         :max-page="totalPages - 1"
@@ -84,6 +85,11 @@ export default {
       required: false,
       default: null
     },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     areas: {
       type: Array,
       required: false,

app/javascript/template_builder/preview.vue

@@ -157,7 +157,7 @@ export default {
     acceptFileTypes: {
       type: String,
       required: false,
-      default: 'image/*, application/pdf'
+      default: 'image/*, application/pdf, application/zip'
     },
     withReplaceButton: {
       type: Boolean,

app/javascript/template_builder/replace.vue

@@ -35,7 +35,7 @@ export default {
     acceptFileTypes: {
       type: String,
       required: false,
-      default: 'image/*, application/pdf'
+      default: 'image/*, application/pdf, application/zip'
     }
   },
   emits: ['success'],

app/javascript/template_builder/upload.vue

@@ -57,7 +57,7 @@ export default {
     acceptFileTypes: {
       type: String,
       required: false,
-      default: 'image/*, application/pdf'
+      default: 'image/*, application/pdf, application/zip'
     }
   },
   emits: ['success', 'error'],

app/jobs/process_submitter_completion_job.rb

@@ -135,19 +135,33 @@ class ProcessSubmitterCompletionJob
   end
 
   def enqueue_next_submitter_request_notification(submitter)
-    next_submitter_item =
+    submission = submitter.submission
-      submitter.submission.template_submitters.find do |e|
+    submitters_index = submission.submitters.index_by(&:uuid)
-        sub = submitter.submission.submitters.find { |s| s.uuid == e['uuid'] }
 
-        next unless sub
+    next_submitter_items =
+      if submission.template_submitters.any? { |s| s['order'] }
+        submitter_groups =
+          submission.template_submitters.group_by.with_index { |s, index| s['order'] || index }
 
-        sub.completed_at.blank? && sub.sent_at.blank?
+        current_group_index = submitter_groups.find { |_, group| group.any? { |s| s['uuid'] == submitter.uuid } }&.first
+
+        if submitter_groups[current_group_index + 1] &&
+           submitters_index.values_at(*submitter_groups[current_group_index].pluck('uuid'))
+                           .compact.all?(&:completed_at?)
+          submitter_groups[current_group_index + 1]
+        end
+      else
+        submission.template_submitters.find do |e|
+          sub = submitters_index[e['uuid']]
+
+          next unless sub
+
+          sub.completed_at.blank? && sub.sent_at.blank?
+        end
       end
 
-    return unless next_submitter_item
+    next_submitters = submitters_index.values_at(*Array.wrap(next_submitter_items).pluck('uuid')).compact
 
-    next_submitter = submitter.submission.submitters.find { |s| s.uuid == next_submitter_item['uuid'] }
+    Submitters.send_signature_requests(next_submitters)
-
-    Submitters.send_signature_requests([next_submitter])
   end
 end

app/jobs/send_submitter_invitation_email_job.rb

@@ -6,6 +6,7 @@ class SendSubmitterInvitationEmailJob
   def perform(params = {})
     submitter = Submitter.find(params['submitter_id'])
 
+    return if submitter.completed_at?
     return if submitter.submission.source == 'invite' && !Accounts.can_send_emails?(submitter.account, on_events: true)
 
     unless Accounts.can_send_invitation_emails?(submitter.account)

app/mailers/submitter_mailer.rb

@@ -30,6 +30,7 @@ class SubmitterMailer < ApplicationMailer
                @submitter.template&.preferences&.dig('request_email_subject').presence
 
     @email_config = AccountConfigs.find_for_account(@current_account, AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY)
+    @body ||= fetch_config_email_body(@email_config, @submitter)
 
     assign_message_metadata('submitter_invitation', @submitter)
 
@@ -71,7 +72,7 @@ class SubmitterMailer < ApplicationMailer
     @subject ||= @email_config.value['subject'] if @email_config
 
     @body = template_preferences['completed_notification_email_body'].presence
-    @body ||= @email_config.value['body'] if @email_config
+    @body ||= fetch_config_email_body(@email_config, @submitter)
 
     assign_message_metadata('submitter_completed', @submitter)
 
@@ -127,7 +128,7 @@ class SubmitterMailer < ApplicationMailer
     @subject ||= @email_config.value['subject'] if @email_config
 
     @body = template_preferences['documents_copy_email_body'].presence
-    @body ||= @email_config.value['body'] if @email_config
+    @body ||= fetch_config_email_body(@email_config, @submitter)
 
     assign_message_metadata('submitter_documents_copy', @submitter)
     reply_to = build_submitter_reply_to(submitter, email_config: @email_config, documents_copy_email: true)
@@ -246,4 +247,8 @@ class SubmitterMailer < ApplicationMailer
       user.friendly_name
     end
   end
+
+  def fetch_config_email_body(email_config, _submitter = nil)
+    email_config ? email_config.value['body'].presence : nil
+  end
 end

app/mailers/template_mailer.rb

@@ -2,6 +2,7 @@
 
 class TemplateMailer < ApplicationMailer
   def otp_verification_email(template, email:)
+    @current_account = template.account
     @template = template
 
     @otp_code = EmailVerificationCodes.generate([email.downcase.strip, template.slug].join(':'))

app/views/email_smtp_settings/index.html.erb

@@ -35,17 +35,19 @@
             <%= ff.select :authentication, options_for_select([%w[Plain plain], %w[Login login], %w[CRAM-MD5 cram_md5]], value.fetch('authentication', 'plain')), { prompt: true }, required: true, class: 'base-select' %>
           </div>
         </div>
-        <div class="form-control">
+        <% if !Docuseal.multitenant? || can?(:manage, :personalization_advanced) %>
-          <%= ff.label :security_label, 'SMTP Security', class: 'label' %>
+          <div class="form-control">
-          <div class="flex items-center space-x-6">
+            <%= ff.label :security_label, 'SMTP Security', class: 'label' %>
-            <% [%w[Auto none], %w[SSL ssl], %w[TLS tls], %w[Noverify noverify]].each do |(label, val)| %>
+            <div class="flex items-center space-x-6">
-              <%= ff.label :security, value: val, for: "#{val}_radio", class: 'label' do %>
+              <% [%w[Auto none], %w[SSL ssl], %w[TLS tls], %w[Noverify noverify]].each do |(label, val)| %>
-                <%= ff.radio_button :security, val, checked: (value['security'].blank? && val == 'none') || value['security'] == val, id: "#{val}_radio", class: 'base-radio mr-2' %>
+                <%= ff.label :security, value: val, for: "#{val}_radio", class: 'label' do %>
-                <%= label %>
+                  <%= ff.radio_button :security, val, checked: (value['security'].blank? && val == 'none') || value['security'] == val, id: "#{val}_radio", class: 'base-radio mr-2' %>
+                  <%= label %>
+                <% end %>
               <% end %>
-            <% end %>
+            </div>
           </div>
-        </div>
+        <% end %>
         <div class="form-control">
           <%= ff.label :from_email, t('send_from_email'), class: 'label' %>
           <%= ff.email_field :from_email, value: value['from_email'], required: !Docuseal.multitenant?, class: 'base-input' %>

app/views/esign_settings/show.html.erb

@@ -141,7 +141,7 @@
             <%= t('preferences') %>
           </h2>
         </div>
-        <% if can?(:manage, account_config) && (can?(:manage, :personalization_advanced) || !Docuseal.multitenant?) %>
+        <% if can?(:manage, account_config) && (can?(:manage, :personalization_advanced) || account_config.persisted?) %>
           <%= 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">

app/views/layouts/application.html.erb

@@ -18,7 +18,6 @@
       <link href="<%= canonical_url %>" rel="canonical">
     <% end %>
     <%= stylesheet_pack_tag 'application', media: 'all' %>
-    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
     <%= render 'shared/plausible' if !signed_in? && ENV['PLAUSIBLE_DOMAIN'] %>
   </head>
   <body>

app/views/layouts/form.html.erb

@@ -12,7 +12,6 @@
       <%= javascript_pack_tag 'form', defer: true %>
     <% end %>
     <%= stylesheet_pack_tag 'form', media: 'all' %>
-    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
   </head>
   <body>
     <%= yield %>

app/views/layouts/plain.html.erb

@@ -12,7 +12,6 @@
       <%= javascript_pack_tag 'application', defer: true %>
     <% end %>
     <%= stylesheet_pack_tag 'application', media: 'all' %>
-    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
   </head>
   <body>
     <% if flash.present? %><%= render 'shared/flash' %><% end %>

app/views/personalization_settings/_documents_copy_email_form.html.erb

@@ -13,17 +13,7 @@
           <%= ff.label :subject, t('subject'), class: 'label' %>
           <%= ff.text_field :subject, required: true, class: 'base-input', dir: 'auto' %>
         </div>
-        <div class="form-control">
+        <%= render 'personalization_settings/email_body_field', ff:, config: f.object %>
-          <div class="flex items-center">
-            <%= ff.label :body, t('body'), class: 'label' %>
-            <span class="tooltip" data-tip="<%= t('use_following_placeholders_text_') %> <%= AccountConfig::DEFAULT_VALUES[AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY].call['body'].scan(/{.*?}/).join(', ') %>">
-              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
-            </span>
-          </div>
-          <autoresize-textarea>
-            <%= ff.text_area :body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
-          </autoresize-textarea>
-        </div>
         <% if can?(:manage, :reply_to) || can?(:manage, :personalization_advanced) %>
           <div class="form-control">
             <%= ff.label :reply_to, t('reply_to'), class: 'label' %>

app/views/personalization_settings/_email_body_field.html.erb

@@ -0,0 +1,11 @@
+<div class="form-control">
+  <div class="flex items-center">
+    <%= ff.label :body, t('body'), class: 'label' %>
+    <span class="tooltip" data-tip="<%= t('use_following_placeholders_text_') %> <%= AccountConfig::DEFAULT_VALUES[local_assigns[:config].key].call['body'].scan(/{.*?}/).join(', ') %>">
+      <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+    </span>
+  </div>
+  <autoresize-textarea>
+    <%= ff.text_area :body, required: true, class: 'base-input w-full !rounded-2xl py-2', dir: 'auto' %>
+  </autoresize-textarea>
+</div>

app/views/personalization_settings/_signature_request_email_form.html.erb

@@ -13,17 +13,7 @@
           <%= ff.label :subject, t('subject'), class: 'label' %>
           <%= ff.text_field :subject, required: true, class: 'base-input', dir: 'auto' %>
         </div>
-        <div class="form-control">
+        <%= render 'personalization_settings/email_body_field', ff:, config: f.object %>
-          <div class="flex items-center">
-            <%= ff.label :body, t('body'), class: 'label' %>
-            <span class="tooltip" data-tip="<%= t('use_following_placeholders_text_') %> <%= AccountConfig::DEFAULT_VALUES[AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY].call['body'].scan(/{.*?}/).join(', ') %>">
-              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
-            </span>
-          </div>
-          <autoresize-textarea>
-            <%= ff.text_area :body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
-          </autoresize-textarea>
-        </div>
       <% end %>
       <div class="form-control pt-2">
         <%= f.button button_title(title: t('save'), disabled_with: t('saving')), class: 'base-button' %>

app/views/personalization_settings/_submitter_completed_email_form.html.erb

@@ -18,17 +18,7 @@
           </div>
           <%= ff.text_field :subject, required: true, class: 'base-input', dir: 'auto' %>
         </div>
-        <div class="form-control">
+        <%= render 'personalization_settings/email_body_field', ff:, config: f.object %>
-          <div class="flex items-center">
-            <%= ff.label :body, t('body'), class: 'label' %>
-            <span class="tooltip" data-tip="<%= t('use_following_placeholders_text_') %> <%= AccountConfig::DEFAULT_VALUES[AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY].call['body'].scan(/{.*?}/).join(', ') %>">
-              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
-            </span>
-          </div>
-          <autoresize-textarea>
-            <%= ff.text_area :body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
-          </autoresize-textarea>
-        </div>
         <div class="flex items-center justify-between pt-2.5 mx-1">
           <span>
             <%= t('attach_documents') %>

app/views/shared/_posthog.html.erb

@@ -1,4 +0,0 @@
-<script>
-  !function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="capture identify alias people.set people.set_once set_config register register_once unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled onFeatureFlags getFeatureFlag getFeatureFlagPayload reloadFeatureFlags group updateEarlyAccessFeatureEnrollment getEarlyAccessFeatures getActiveMatchingSurveys getSurveys".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]);
-  posthog.init('<%= ENV.fetch('POSTHOG_TOKEN', nil) %>',{api_host:'https://app.posthog.com',autocapture: false,enable_recording_console_log: true,capture_pageview: false,session_recording:{maskAllInputs: false,maskInputOptions: {password: true}}})
-</script>

app/views/submissions/_detailed_form.html.erb

@@ -1,3 +1,4 @@
+<% has_phone_field = false %>
 <%= form_for '', url: template_submissions_path(template), html: { class: 'space-y-4', autocomplete: 'off' }, data: { turbo_frame: :_top } do |f| %>
   <% submitters = template.submitters.reject { |e| e['invite_by_uuid'].present? || e['optional_invite_by_uuid'].present? } %>
   <dynamic-list class="space-y-4">
@@ -11,6 +12,7 @@
           </div>
           <div class="grid <%= 'md:grid-cols-2' if submitters.size > 1 %> gap-4">
             <% submitters.each_with_index do |item, index| %>
+              <% prefillable_fields = local_assigns[:prefillable_fields].to_a.select { |f| f['submitter_uuid'] == item['uuid'] } %>
               <submitter-item class="form-control">
                 <% if submitters.size > 1 %>
                   <label class="label pt-0 pb-1">
@@ -18,30 +20,62 @@
                   </label>
                 <% end %>
                 <input type="hidden" name="submission[1][submitters][][uuid]" value="<%= item['uuid'] %>">
-                <submitters-autocomplete data-field="name">
+                <% if prefillable_fields.blank? %>
-                  <linked-input data-target-id="<%= "detailed_name_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
+                  <submitters-autocomplete data-field="name">
-                    <%= tag.input type: 'text', name: 'submission[1][submitters][][name]', autocomplete: 'off', class: 'base-input !h-10 w-full', placeholder: t('name'), required: index.zero? || template.preferences['require_all_submitters'], value: item['email'].present? ? current_account.submitters.accessible_by(current_ability).where.not(name: nil).order(id: :desc).find_by(email: item['email'])&.name : ((params[:selfsign] && index.zero?) || item['is_requester'] ? current_user.full_name : ''), dir: 'auto', id: "detailed_name_#{item['uuid']}" %>
+                    <linked-input data-target-id="<%= "detailed_name_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
-                  </linked-input>
+                      <%= tag.input type: 'text', name: 'submission[1][submitters][][name]', autocomplete: 'off', class: 'base-input !h-10 w-full', placeholder: t('name'), required: index.zero? || template.preferences['require_all_submitters'], value: item['email'].present? ? current_account.submitters.accessible_by(current_ability).where.not(name: nil).order(id: :desc).find_by(email: item['email'])&.name : ((params[:selfsign] && index.zero?) || item['is_requester'] ? current_user.full_name : ''), dir: 'auto', id: "detailed_name_#{item['uuid']}" %>
-                </submitters-autocomplete>
+                    </linked-input>
-                <div class="grid <%= 'md:grid-cols-2 gap-1' if submitters.size == 1 %>">
+                  </submitters-autocomplete>
+                  <div class="grid <%= 'md:grid-cols-2 gap-1' if submitters.size == 1 %>">
+                    <submitters-autocomplete data-field="email">
+                      <linked-input data-target-id="<%= "detailed_email_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
+                        <input type="email" multiple name="submission[1][submitters][][email]" autocomplete="off" class="base-input !h-10 mt-1.5 w-full" placeholder="<%= "#{t('email')} (#{t('optional')})" %>" value="<%= item['email'].presence || ((params[:selfsign] && index.zero?) || item['is_requester'] ? current_user.email : '') %>" id="detailed_email_<%= item['uuid'] %>">
+                      </linked-input>
+                    </submitters-autocomplete>
+                    <% has_phone_field = true %>
+                    <submitters-autocomplete data-field="phone">
+                      <linked-input data-target-id="<%= "detailed_phone_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
+                        <%= tag.input type: 'tel', pattern: '^\+[0-9\s\-]+$', oninvalid: "this.value ? this.setCustomValidity('#{t('use_international_format_1xxx_')}') : ''", oninput: "this.setCustomValidity('')", name: 'submission[1][submitters][][phone]', autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full', placeholder: local_assigns[:require_phone_2fa] == true ? t(:phone) : "#{t('phone')} (#{t('optional')})", id: "detailed_phone_#{item['uuid']}", required: local_assigns[:require_phone_2fa] == true %>
+                      </linked-input>
+                    </submitters-autocomplete>
+                  </div>
+                <% end %>
+                <% if prefillable_fields.present? %>
                   <submitters-autocomplete data-field="email">
                     <linked-input data-target-id="<%= "detailed_email_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
-                      <input type="email" multiple name="submission[1][submitters][][email]" autocomplete="off" class="base-input !h-10 mt-1.5 w-full" placeholder="<%= "#{t('email')} (#{t('optional')})" %>" value="<%= item['email'].presence || ((params[:selfsign] && index.zero?) || item['is_requester'] ? current_user.email : '') %>" id="detailed_email_<%= item['uuid'] %>">
+                      <input type="email" multiple name="submission[1][submitters][][email]" autocomplete="off" class="base-input !h-10 w-full" placeholder="<%= t('email') %>" value="<%= item['email'].presence || ((params[:selfsign] && index.zero?) || item['is_requester'] ? current_user.email : '') %>" id="detailed_email_<%= item['uuid'] %>" required>
                     </linked-input>
                   </submitters-autocomplete>
-                  <submitters-autocomplete data-field="phone">
+                  <% if local_assigns[:require_phone_2fa] == true || prefillable_fields.any? { |f| f['type'] == 'phone' } %>
-                    <linked-input data-target-id="<%= "detailed_phone_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
+                    <% has_phone_field = true %>
-                      <%= tag.input type: 'tel', pattern: '^\+[0-9\s\-]+$', oninvalid: "this.value ? this.setCustomValidity('#{t('use_international_format_1xxx_')}') : ''", oninput: "this.setCustomValidity('')", name: 'submission[1][submitters][][phone]', autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full', placeholder: local_assigns[:require_phone_2fa] == true ? t(:phone) : "#{t('phone')} (#{t('optional')})", id: "detailed_phone_#{item['uuid']}", required: local_assigns[:require_phone_2fa] == true %>
+                    <submitters-autocomplete data-field="phone">
-                    </linked-input>
+                      <linked-input data-target-id="<%= "detailed_phone_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
-                  </submitters-autocomplete>
+                        <%= tag.input type: 'tel', pattern: '^\+[0-9\s\-]+$', oninvalid: "this.value ? this.setCustomValidity('#{t('use_international_format_1xxx_')}') : ''", oninput: "this.setCustomValidity('')", name: 'submission[1][submitters][][phone]', autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full', placeholder: t(:phone), id: "detailed_phone_#{item['uuid']}", required: true %>
-                </div>
+                      </linked-input>
+                    </submitters-autocomplete>
+                  <% end %>
+                  <% prefillable_fields.each do |field| %>
+                    <% if field['type'] == 'checkbox' %>
+                      <label for="detailed_field_<%= field['uuid'] %>" class="flex items-center justify-between mt-1.5 pl-3 pr-2.5 h-10 border border-base-content/20 rounded-full cursor-pointer transition-colors bg-white">
+                        <span class="text-base select-none px-1"> <%= field['title'].presence || field['name'] %></span>
+                        <%= tag.input type: 'checkbox', name: "submission[1][submitters][][values][#{field['uuid']}]", id: "detailed_field_#{field['uuid']}", class: 'toggle toggle-sm', style: 'width: 38px; --handleoffset: 17px', checked: field['default_value'].present? && (field['default_value'] == true || field['default_value'].to_s == '1' || field['default_value'].to_s.downcase == 'true'), required: field['required'], value: 'true' %>
+                      </label>
+                    <% elsif field['type'] == 'select' || field['type'] == 'radio' %>
+                      <%= select_tag "submission[1][submitters][][values][#{field['uuid']}]", options_for_select(field['options'].pluck('value'), field['default_value']), prompt: t(:select), id: "detailed_field_#{field['uuid']}", class: 'select select-sm base-input !h-10 mt-1.5 ', required: field['required'] %>
+                    <% elsif field['type'] == 'date' %>
+                      <%= tag.input type: field['type'], name: "submission[1][submitters][][values][#{field['uuid']}]", autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full border rounded p-3', placeholder: (field['required'] ? field['title'].presence || field['name'] : "#{field['title'].presence || field['name']} (#{t('optional')})"), value: field['default_value'], id: "detailed_field_#{field['uuid']}", required: field['required'] %>
+                    <% elsif field['type'] != 'phone' %>
+                      <%= tag.input type: field['type'], name: "submission[1][submitters][][values][#{field['uuid']}]", autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full border rounded p-3', placeholder: (field['required'] ? field['title'].presence || field['name'] : "#{field['title'].presence || field['name']} (#{t('optional')})"), value: field['default_value'], id: "detailed_field_#{field['uuid']}", required: field['required'] %>
+                    <% end %>
+                  <% end %>
+                <% end %>
               </submitter-item>
             <% end %>
           </div>
         </div>
       </div>
     </div>
-    <% if params[:selfsign].blank? %>
+    <% if params[:selfsign].blank? && local_assigns[:prefillable_fields].blank? %>
       <a href="#" class="btn btn-primary btn-sm w-full flex items-center justify-center" data-action="click:dynamic-list#addItem">
         <%= svg_icon('user_plus', class: 'w-4 h-4 stroke-2') %>
         <span><%= t('add_new') %></span>
@@ -51,7 +85,9 @@
   <div>
     <%= render('submitters_order', f:, template:) if Accounts.can_send_emails?(current_account) %>
     <%= render 'send_email', f:, template: %>
-    <%= render 'send_sms', f: %>
+    <% if has_phone_field %>
+      <%= render 'send_sms', f: %>
+    <% end %>
   </div>
   <div class="form-control">
     <%= f.button button_title(title: t('add_recipients')), class: 'base-button' %>

app/views/submissions/_send_email.html.erb

@@ -4,7 +4,7 @@
   <% can_send_emails = Accounts.can_send_emails?(current_account) %>
   <div class="flex justify-between items-center">
     <%= f.label :send_email, for: uuid = SecureRandom.uuid, class: 'flex items-center cursor-pointer' do %>
-      <%= f.check_box :send_email, id: uuid, class: 'base-checkbox', disabled: !can_send_emails || local_assigns[:disable_email], checked: can_send_emails && !local_assigns.key?(:resend_email) && !local_assigns[:disable_email] %>
+      <%= f.check_box :send_email, id: uuid, class: 'base-checkbox', disabled: !can_send_emails || local_assigns[:disable_email], checked: can_send_emails && !local_assigns.key?(:resend_email) && !local_assigns[:disable_email] && template&.preferences&.dig('request_email_enabled') != false %>
       <span class="label"><%= local_assigns[:resend_email] ? t('re_send_email') : t('send_email') %></span>
     <% end %>
     <div>

app/views/submissions/_submitters_order.html.erb

@@ -1,4 +1,4 @@
-<% if template.preferences['submitters_order'] == 'preserved' %>
+<% if template.preferences['submitters_order'] == 'preserved' || template.submitters.any? { |s| s['order'] } %>
   <%= f.hidden_field :preserve_order, value: '1' %>
 <% elsif template.submitters.size > 1 %>
   <div class="form-control">

app/views/submissions/new.html.erb

@@ -1,11 +1,13 @@
 <% require_phone_2fa = @template.preferences['require_phone_2fa'] == true %>
+<% prefillable_fields = @template.fields.select { |f| f['prefillable'] } %>
+<% only_detailed = require_phone_2fa || prefillable_fields.present? %>
 <%= render 'shared/turbo_modal_large', title: params[:selfsign] ? t('add_recipients') : t('add_new_recipients') do %>
-  <% options = [require_phone_2fa ? nil : [t('via_email'), 'email'], require_phone_2fa ? nil : [t('via_phone'), 'phone'], [t('detailed'), 'detailed'], [t('upload_list'), 'list']].compact %>
+  <% options = [only_detailed ? nil : [t('via_email'), 'email'], only_detailed ? nil : [t('via_phone'), 'phone'], [t('detailed'), 'detailed'], [t('upload_list'), 'list']].compact %>
   <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center px-2 mt-4 block">
     <div class="flex justify-center">
       <% options.each_with_index do |(label, value), index| %>
         <div>
-          <%= radio_button_tag 'option', value, value == (require_phone_2fa ? 'detailed' : 'email'), class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
+          <%= radio_button_tag 'option', value, value == (only_detailed ? 'detailed' : 'email'), class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
           <label for="option_<%= value %>" class="block bg-base-200 md:min-w-[112px] text-sm font-semibold whitespace-nowrap py-1.5 px-4 peer-checked:bg-base-300 <%= 'hidden sm:inline-block' if value == 'list' %> <%= 'rounded-l-3xl' if index.zero? %> <%= 'rounded-r-3xl sm:rounded-r-none' if value == 'detailed' %> <%= 'rounded-r-3xl' if index == options.size - 1 %>">
             <%= label %>
           </label>
@@ -14,7 +16,7 @@
     </div>
   </toggle-visible>
   <div class="px-5 mb-5 mt-4">
-    <% unless require_phone_2fa %>
+    <% unless only_detailed %>
       <div id="email">
         <%= render 'email_form', template: @template %>
       </div>
@@ -22,8 +24,8 @@
         <%= render 'phone_form', template: @template %>
       </div>
     <% end %>
-    <div id="detailed" class="<%= 'hidden' unless require_phone_2fa %>">
+    <div id="detailed" class="<%= 'hidden' unless only_detailed %>">
-      <%= render 'detailed_form', template: @template, require_phone_2fa: %>
+      <%= render 'detailed_form', template: @template, require_phone_2fa:, prefillable_fields: %>
     </div>
     <div id="list" class="hidden">
       <%= render 'list_form', template: @template %>

app/views/submissions/show.html.erb

@@ -109,7 +109,7 @@
                   <%= render 'submissions/annotation', annot: %>
                 <% end %>
                 <% fields_index.dig(document.uuid, index)&.each do |(area, field)| %>
-                  <% value = values[field['uuid']] %>
+                  <% value = values[field['uuid']].presence || (field['default_value'] != '{{date}}' && field['readonly'] == true && field['default_value'].present? ? Submitters::SubmitValues.template_default_value_for_submitter(field['default_value'], @submission.submitters.find { |e| e.uuid == field['submitter_uuid'] }, with_time: false) : nil) %>
                   <% value ||= field['default_value'] if field['type'] == 'heading' %>
                   <% next if value.blank? %>
                   <% submitter = submitters_index[field['submitter_uuid']] %>
@@ -238,7 +238,7 @@
         <div class="px-1.5 mb-4">
           <% submitter_fields_index[item['uuid']].to_a.each_with_index do |field, index| %>
             <% submitter_field_counters[field['type']] += 1 %>
-            <% value = values[field['uuid']] %>
+            <% value = values[field['uuid']].presence || (field['default_value'] != '{{date}}' && field['readonly'] == true && field['default_value'].present? ? Submitters::SubmitValues.template_default_value_for_submitter(field['default_value'], @submission.submitters.find { |e| e.uuid == field['submitter_uuid'] }, with_time: false) : nil) %>
             <% next if value.blank? %>
             <% next if field['type'] == 'heading' %>
             <div class="pt-2.5 border-b border-base-300">

app/views/submit_form/show.html.erb

@@ -77,7 +77,7 @@
                   <%= render 'submit_form/annotations', annots: %>
                 <% end %>
                 <% fields_index.dig(document.uuid, index)&.each do |(area, field)| %>
-                  <% 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) %>
+                  <% value = values[field['uuid']].presence || (field['readonly'] == true && 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 value == '{{date}}' && field['submitter_uuid'] != @submitter.uuid %>

app/views/submit_form_draw_signature/show.html.erb

@@ -12,7 +12,6 @@
       <%= javascript_pack_tag 'draw', defer: true %>
     <% end %>
     <%= stylesheet_pack_tag 'form', media: 'all' %>
-    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
   </head>
   <body>
     <% field = (@submitter.submission.template_fields || @submitter.template.fields).find { |f| f['type'] == 'signature' && f['uuid'].starts_with?(params[:f]) } %>

app/views/submitter_mailer/invitation_email.html.erb

@@ -1,14 +1,13 @@
-<% if @email_config || @body.present? %>
+<% if @body.present? %>
-  <% body = (@body.presence || @email_config.value['body']).to_s %>
+  <%= render 'custom_content', content: @body, submitter: @submitter %>
-  <%= render 'custom_content', content: body, submitter: @submitter %>
+  <% if !@body.match?(ReplaceEmailVariables::SUBMITTER_LINK) && !@body.match?(ReplaceEmailVariables::SUBMITTER_ID) && !@body.match?(ReplaceEmailVariables::SUBMISSION_LINK) && !@body.match?(ReplaceEmailVariables::TEMPLATE_ID) && !@submitter.submission.source.in?(%w[api embed]) %>
-  <% if !body.match?(ReplaceEmailVariables::SUBMITTER_LINK) && !body.match?(ReplaceEmailVariables::SUBMITTER_ID) && !body.match?(ReplaceEmailVariables::SUBMISSION_LINK) && !body.match?(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 %>
 <% else %>
   <p><%= t('hi_there') %>,</p>
   <p><%= I18n.t(@submitter.with_signature_fields? ? :you_have_been_invited_to_sign_the_name : :you_have_been_invited_to_submit_the_name_form, name: @submitter.submission.name || @submitter.submission.template.name) %></p>
   <p><%= link_to I18n.t(@submitter.with_signature_fields? ? :review_and_sign : :review_and_submit), submit_form_url(slug: @submitter.slug, t: SubmissionEvents.build_tracking_param(@submitter, 'click_email'), host: ENV.fetch('EMAIL_HOST', Docuseal.default_url_options[:host])) %></p>
-  <p><%= t('please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this') %></p>
+  <p><%= t('please_contact_us_by_replying_to_this_email_if_you_have_any_questions') %></p>
   <p>
   <%= t('thanks') %>,<br><%= @current_account.name %>
   </p>

app/views/templates/_dropzone.html.erb

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

app/views/templates/_upload_button.html.erb

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

app/views/templates_folders/edit.html.erb

@@ -3,27 +3,23 @@
   <% if with_subfolder %>
     <%= form_for '', url: template_folder_path(@template), method: :put, data: { turbo_frame: :_top }, html: { id: 'subfolder_form', autocomplete: :off } do |f| %>
       <%= f.hidden_field :parent_name, value: @template.folder.parent_folder&.name || @template.folder.name %>
-      <toggle-visible data-element-ids="<%= %w[folder_form subfolder_form].to_json %>" class="block relative">
+      <toggle-visible data-element-ids="<%= %w[folder_form subfolder_form].to_json %>" class="block relative" data-focus-id="name">
         <div class="flex items-center justify-between mb-2.5">
-          <label for="is_root_folder" class="flex items-center">
+          <label for="is_root_folder" class="flex items-center tooltip tooltip-right pr-2 group" data-tip="<%= t('change_parent_folder') %>">
             <%= check_box_tag :is_root_folder, 'folder_form', data: { action: 'change:toggle-visible#trigger' }, class: 'hidden' %>
-            <span class="flex items-center space-x-0.5 mt-1 peer">
+            <span class="flex items-center mt-1">
-              <%= svg_icon('folder', class: 'w-6 h-5 flex-shrink-0') %>
+              <%= svg_icon('folder', class: 'w-5 h-5 flex-shrink-0 group-hover:hidden mr-1') %>
+              <%= svg_icon('folder_share', class: 'w-5 h-5 flex-shrink-0 hidden group-hover:inline mr-1') %>
               <span class="text-md">
                 <%= @template.folder.parent_folder&.name || @template.folder.name %>
               </span>
             </span>
-            <span class="pl-1 tooltip tooltip-right md:opacity-0 hover:opacity-100 peer-hover:opacity-100" data-tip="<%= t('change_parent_folder') %>">
-              <span href="<%= edit_template_folder_path(@template.id) %>" data-turbo-frame="modal">
-                <%= svg_icon('pencil', class: 'w-5 h-5') %>
-              </span>
-            </span>
           </label>
         </div>
       </toggle-visible>
       <div class="form-control mb-6">
         <folder-autocomplete class="block" data-submit-on-select="true" data-parent-name="<%= @template.folder.parent_folder&.name || @template.folder.name %>" data-enabled="<%= params[:autocomplete] != 'false' %>">
-          <%= f.text_field :name, required: true, placeholder: "#{t('new_subfolder_name')}...", class: 'base-input w-full', autofocus: true %>
+          <%= f.text_field :name, required: true, placeholder: "#{t('new_subfolder_name')}...", class: 'base-input w-full', autofocus: true, id: 'subfolder_name' %>
         </folder-autocomplete>
       </div>
       <div class="form-control">

app/views/templates_preferences/_recipients.html.erb

@@ -1,4 +1,5 @@
 <% close_on_submit = local_assigns.fetch(:close_on_submit, true) %>
+<% is_order_set = template.submitters.any? { |s| s['order'] } %>
 <%= form_for template, url: template_recipients_path(template), method: :post, html: { autocomplete: 'off', class: 'mt-1', id: :submitters_form }, data: { close_on_submit: } do |f| %>
   <% unless close_on_submit %>
     <toggle-on-submit data-element-id="form_saved_alert"></toggle-on-submit>
@@ -6,11 +7,24 @@
   <div class="space-y-3 divide-y">
     <% template.submitters.each_with_index do |submitter, index| %>
       <div class="<%= 'pt-3' if index.positive? %>">
-        <%= f.fields_for :submitters, item = Struct.new(:name, :uuid, :is_requester, :email, :invite_by_uuid, :optional_invite_by_uuid, :linked_to_uuid, :option).new(*submitter.values_at('name', 'uuid', 'is_requester', 'email', 'invite_by_uuid', 'optional_invite_by_uuid', 'linked_to_uuid')), index: do |ff| %>
+        <%= f.fields_for :submitters, item = Struct.new(:name, :uuid, :is_requester, :email, :invite_by_uuid, :optional_invite_by_uuid, :linked_to_uuid, :order, :option).new(*submitter.values_at('name', 'uuid', 'is_requester', 'email', 'invite_by_uuid', 'optional_invite_by_uuid', 'linked_to_uuid', 'order')), index: do |ff| %>
           <% item.option = item.is_requester.present? ? 'is_requester' : (item.email.present? ? 'email' : (item.linked_to_uuid.present? ? "linked_to_#{item.linked_to_uuid}" : (item.invite_by_uuid.present? ? "invite_by_#{item.invite_by_uuid}" : (item.optional_invite_by_uuid.present? ? "optional_invite_by_#{item.optional_invite_by_uuid}" : '')))) %>
           <%= ff.hidden_field :uuid %>
           <div class="form-control">
-            <%= ff.text_field :name, class: 'w-full outline-none border-transparent focus:border-transparent focus:ring-0 bg-base-100 px-1 peer mb-2', autocomplete: 'off', placeholder: "#{index + 1}#{(index + 1).ordinal} Party", required: true %>
+            <div class="flex justify-between">
+              <%= ff.text_field :name, class: 'w-full outline-none border-transparent focus:border-transparent focus:ring-0 bg-base-100 px-1 peer mb-2', autocomplete: 'off', placeholder: "#{index + 1}#{(index + 1).ordinal} Party", required: true %>
+              <% if template.submitters.size > 2 %>
+                <div id="order_<%= submitter['uuid'] %>" class="mr-0.5">
+                  <% if is_order_set %>
+                    <%= ff.select :order, options_for_select(template.submitters.map.with_index { |_, i| [(i + 1).ordinalize, i] }, submitter['order'].presence || index), {}, class: 'select select-xs text-sm input-bordered bg-white pl-3.5' %>
+                  <% elsif index == 0 %>
+                    <mount-on-click data-template-id="order_fields" class="link whitespace-nowrap text-sm mt-1 mr-1 block">
+                      <%= t('edit_order') %>
+                    </mount-on-click>
+                  <% end %>
+                </div>
+              <% end %>
+            </div>
             <% if template.submitters.size == 2 %>
               <%= tag.input name: ff.field_name(:email), value: ff.object.email, type: :email, class: 'base-input', multiple: true, autocomplete: 'off', placeholder: t('default_email'), disabled: ff.object.is_requester || ff.object.invite_by_uuid.present? || ff.object.optional_invite_by_uuid.present?, id: field_uuid = SecureRandom.uuid %>
             <% else %>
@@ -85,3 +99,16 @@
     </div>
   <% end %>
 </div>
+<% if template.submitters.size > 2 && !is_order_set %>
+  <template id="order_fields">
+    <% template.submitters.each_with_index do |submitter, index| %>
+      <turbo-stream action="replace" target="order_<%= submitter['uuid'] %>">
+        <template>
+          <div id="order_<%= submitter['uuid'] %>">
+            <%= select_tag "template[submitters][#{index}][order]", options_for_select(template.submitters.map.with_index { |_, i| [(i + 1).ordinalize, i] }, submitter['order'].presence || index), class: 'select select-xs text-sm input-bordered bg-white pl-3.5' %>
+          </div>
+        </template>
+      </turbo-stream>
+    <% end %>
+  </template>
+<% end %>

app/views/templates_preferences/show.html.erb

@@ -59,6 +59,7 @@
         <%= t('form_preferences') %>
       </div>
       <div class="collapse-content">
+        <%= render 'templates_prefillable_fields/form', template: @template %>
         <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-1' }, data: { close_on_submit: false } do |f| %>
           <toggle-on-submit data-element-id="form_saved_alert"></toggle-on-submit>
           <% configs = AccountConfigs.find_or_initialize_for_key(current_account, AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY).value %>
@@ -68,7 +69,7 @@
               <%= ff.url_field :completed_redirect_url, required: false, class: 'base-input', dir: 'auto' %>
             </div>
             <%= ff.fields_for :completed_message, ff.object.completed_message do |fff| %>
-              <div class="form-control mb-2 border-t mt-4">
+              <div class="form-control mb-2 mt-4">
                 <%= fff.label :body, t('completion_message'), class: 'label' %>
                 <autoresize-textarea>
                   <%= fff.text_area :body, required: false, class: 'base-input w-full py-2', dir: 'auto' %>
@@ -162,6 +163,14 @@
                 <% end %>
               </div>
             <% end %>
+            <%= f.fields_for :preferences, Struct.new(:request_email_enabled).new(@template.preferences['request_email_enabled']) do |ff| %>
+              <div class="flex items-center justify-between py-2.5 px-1 mb-2">
+                <span>
+                  <%= 'Send signature request email' %>
+                </span>
+                <%= ff.check_box :request_email_enabled, { checked: ff.object.request_email_enabled != false, class: 'toggle', onchange: 'this.form.requestSubmit()' }, 'true', 'false' %>
+              </div>
+            <% end %>
             <div class="form-control pt-2">
               <%= f.button button_title(title: t('save'), disabled_with: t('saving')), class: 'base-button' %>
               <div class="flex justify-center">

app/views/templates_prefillable_fields/_form.html.erb

@@ -0,0 +1,16 @@
+<% select_fields = template.fields.filter_map { |f| [f['name'], f['uuid']] if f['name'].present? && f['type'].in?(TemplatesPrefillableFieldsController::PREFILLABLE_FIELD_TYPES) } %>
+<% if select_fields.present? %>
+  <div class="border-b pb-4 mb-4">
+    <%= form_for '', url: template_prefillable_fields_path(template), method: :post, data: { close_on_submit: false } do |f| %>
+      <div class="form-control">
+        <%= f.hidden_field :prefillable, value: 'true' %>
+        <%= f.label :field_uuid, t(:invite_form_fields), class: 'label' %>
+        <div class="join w-full">
+          <%= select_tag :field_uuid, options_for_select(select_fields), prompt: t(:select_field), class: 'base-select w-full join-item', dir: 'auto', required: true %>
+          <%= f.button button_title(title: t('add'), disabled_with: t('add')), class: 'base-button join-item !px-6' %>
+        </div>
+      </div>
+    <% end %>
+    <%= render partial: 'templates_prefillable_fields/list', locals: { template: } %>
+  </div>
+<% end %>

app/views/templates_prefillable_fields/_list.html.erb

@@ -0,0 +1,6 @@
+<div id="prefillable_fields_list" class="flex gap-1 px-0.5 mt-2 flex-wrap">
+  <% template.fields.each do |f| %>
+    <% next unless f['prefillable'] %>
+    <%= button_to button_title(title: f['name'].presence || f['type'].capitalize, disabled_with: f['name'].presence || f['type'].capitalize, icon: svg_icon('x', class: 'w-4 h-4'), icon_disabled: svg_icon('loader', class: 'w-4 h-4 animate-spin')), template_prefillable_fields_path(template), params: { field_uuid: f['uuid'], prefillable: 'false' }, class: 'badge badge-lg badge-primary space-x-1 pr-3 pl-2', form: { data: { close_on_submit: false } } %>
+  <% end %>
+</div>

app/views/templates_share_link/show.html.erb

@@ -1,3 +1,5 @@
+<% multiple_submitters = @template.submitters.to_a.length > 1 %>
+<% enough_defined_submitters = Templates.filter_undefined_submitters(@template.submitters).size < 2 %>
 <%= render 'shared/turbo_modal_large', title: t('share_link') do %>
   <div class="mt-2 mb-4 px-5">
     <%= form_for @template, url: template_share_link_path(@template), method: :post, html: { id: 'shared_link_form', autocomplete: 'off', class: 'mt-3' }, data: { close_on_submit: false } do |f| %>
@@ -12,28 +14,14 @@
         </check-on-click>
       </div>
     <% end %>
-    <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-4 mb-5' }, data: { close_on_submit: false } do |f| %>
+    <% if multiple_submitters && !enough_defined_submitters %>
-      <% link_form_fields = @template.preferences.fetch('link_form_fields', ['email']) %>
-      <label class="pl-1"><%= t('link_form_fields') %></label>
-      <required-checkbox-group class="flex flex-col md:flex-row items-center gap-2 w-full mt-2">
-        <% %w[name email phone].each do |field| %>
-          <%= label_tag "link_form_fields_#{field}", t(field), class: 'relative flex w-full md:w-1/3 items-center h-12 border-base-300 py-3.5 border rounded-xl' do %>
-            <%= check_box_tag 'template[preferences][link_form_fields][]', field, link_form_fields.include?(field), class: 'absolute !animate-none checkbox left-3', id: "link_form_fields_#{field}" %>
-            <span class="font-medium w-full text-center"><%= t(field) %></span>
-          <% end %>
-        <% end %>
-      </required-checkbox-group>
-    <% end %>
-    <% if Templates.filter_undefined_submitters(@template.submitters).size > 1 %>
       <div class="alert items-start bg-base-100 border-base-300 mt-4">
         <%= svg_icon('info_circle', class: 'stroke-current shrink-0 h-6 w-6 mt-1') %>
         <div><%= t('this_template_has_multiple_parties_which_prevents_the_use_of_a_sharing_link') %></div>
       </div>
-    <% end %>
+      <div class="collapse collapse-arrow join-item border border-base-300 mt-4">
-    <% if @template.submitters.to_a.length > 1 %>
+        <input type="checkbox" name="accordion" class="min-h-0">
-      <div class="collapse collapse-arrow join-item border border-base-300 mt-4 mb-5">
+        <div class="collapse-title py-4 min-h-0">
-        <input type="checkbox" name="accordion">
-        <div class="collapse-title text-xl font-medium">
           <%= t('default_parties') %>
         </div>
         <div class="collapse-content !pb-0">
@@ -41,15 +29,46 @@
         </div>
       </div>
     <% end %>
-    <% if Docuseal.multitenant? || Accounts.can_send_emails?(current_account) %>
+    <div class="collapse collapse-arrow join-item mt-4">
-      <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-3' }, data: { close_on_submit: false } do |f| %>
+      <input id="accordion_checkbox" type="checkbox" name="accordion" class="min-h-0">
-        <%= f.fields_for :preferences, Struct.new(:shared_link_2fa).new(@template.preferences['shared_link_2fa'] == true) do |ff| %>
+      <div class="collapse-title min-h-0 after:!right-3 p-1">
-          <label for="template_preferences_shared_link_2fa" class="flex items-center my-4 justify-between gap-1 alert bg-base-100 border-base-300">
+        <%= t('advanced_settings') %>
-            <span><%= t('request_email_otp_verification_with_shared_link') %></span>
+      </div>
-            <%= ff.check_box :shared_link_2fa, { checked: ff.object.shared_link_2fa == true, disabled: !can?(:update, @template), class: 'toggle', onchange: 'this.form.requestSubmit()' }, 'true', 'false' %>
+      <div class="collapse-content !p-0">
-          </label>
+        <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-4 pt-4 border-t border-base-300' }, data: { close_on_submit: false } do |f| %>
+          <% link_form_fields = @template.preferences.fetch('link_form_fields', ['email']) %>
+          <label class="pl-1"><%= t('link_form_fields') %></label>
+          <required-checkbox-group class="flex flex-col md:flex-row items-center gap-2 w-full mt-2">
+            <% %w[name email phone].each do |field| %>
+              <%= label_tag "link_form_fields_#{field}", t(field), class: 'relative flex w-full md:w-1/3 items-center h-14 border-base-300 py-3.5 border rounded-xl' do %>
+                <%= check_box_tag 'template[preferences][link_form_fields][]', field, link_form_fields.include?(field), class: 'absolute !animate-none checkbox left-3', id: "link_form_fields_#{field}" %>
+                <span class="font-medium w-full text-center"><%= t(field) %></span>
+              <% end %>
+            <% end %>
+          </required-checkbox-group>
         <% end %>
-      <% end %>
+        <% if multiple_submitters && enough_defined_submitters %>
-    <% end %>
+          <div class="collapse collapse-arrow join-item border border-base-300 mt-4">
+            <input type="checkbox" name="accordion" class="min-h-0">
+            <div class="collapse-title py-4 min-h-0">
+              <%= t('default_parties') %>
+            </div>
+            <div class="collapse-content !pb-0">
+              <%= render 'templates_preferences/recipients', template: @template, close_on_submit: false, with_toggles: false, with_submission_requester: false %>
+            </div>
+          </div>
+        <% end %>
+        <% if Docuseal.multitenant? || Accounts.can_send_emails?(current_account) %>
+          <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-4' }, data: { close_on_submit: false } do |f| %>
+            <%= f.fields_for :preferences, Struct.new(:shared_link_2fa).new(@template.preferences['shared_link_2fa'] == true) do |ff| %>
+              <label for="template_preferences_shared_link_2fa" class="flex items-center mt-4 h-14 justify-between gap-1 alert bg-base-100 border-base-300">
+                <span><%= t('request_email_otp_verification_with_shared_link') %></span>
+                <%= ff.check_box :shared_link_2fa, { checked: ff.object.shared_link_2fa == true, disabled: !can?(:update, @template), class: 'toggle', onchange: 'this.form.requestSubmit()' }, 'true', 'false' %>
+              </label>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
   </div>
 <% end %>

app/views/user_mailer/invitation_email.html.erb

@@ -1,7 +1,7 @@
 <p><%= @user.first_name.present? ? t('hello_name', name: @user.first_name) : t('hi_there') %>,</p>
 <p><%= t('you_have_been_invited_to_account_name_product_name_please_sign_up_using_the_link_below_', account_name: @user.account.name, product_name: Docuseal.product_name) %></p>
 <p><%= link_to t('sign_up'), invitation_url(reset_password_token: @token) %></p>
-<p><%= t('please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this') %></p>
+<p><%= t('please_contact_us_by_replying_to_this_email_if_you_have_any_questions') %></p>
 <p>
   <%= t('thanks') %>,<br><%= @current_account.name %>
 </p>

config/initializers/devise.rb

@@ -321,7 +321,7 @@ Devise.setup do |config|
   # apps is `200 OK` and `302 Found respectively`, but new apps are generated with
   # these new defaults that match Hotwire/Turbo behavior.
   # Note: These might become the new default in future versions of Devise.
-  config.responder.error_status = :unprocessable_entity
+  config.responder.error_status = :unprocessable_content
   config.responder.redirect_status = :see_other
 
   # ==> Configuration for :registerable

config/locales/i18n.yml

@@ -23,6 +23,10 @@ en: &en
   pro: Pro
   thanks: Thanks
   private: Private
+  select: Select
+  party: Party
+  edit_order: Edit Order
+  invite_form_fields: Invite form fields
   default_parties: Default parties
   authenticate_embedded_form_preview_with_token: Authenticate embedded form preview with token
   stripe_integration: Stripe Integration
@@ -42,7 +46,6 @@ en: &en
   send_verification_code: Send verification code
   code_has_been_resent: Code has been re-sent
   invalid_code: Invalid code
-  unarchive: Unarchive
   signed: Signed
   first_party: 'First Party'
   remove_filter: Remove filter
@@ -56,7 +59,6 @@ en: &en
   accessiable_by: Accessible by
   team_access: Team access
   document_download_filename_format: Document download filename format
-  document_name: Document Name
   docuseal_trusted_signature: DocuSeal Trusted Signature
   hello_name: Hello %{name}
   you_are_invited_to_product_name: You are invited to %{product_name}
@@ -73,7 +75,7 @@ en: &en
   awaiting_completion_by_the_other_party: "Awaiting completion by the other party"
   review_and_sign: Review and Sign
   review_and_submit: Review and Submit
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: "Please contact us by replying to this email if you have any questions."
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: "Please contact us by replying to this email if you have any questions."
   submitter_invitation_sms_body_sign: '{account.name} has invited you to sign a document: {submitter.link}'
   verification_code_sms_body: 'Verification code: {code}'
   you_are_invited_to_submit_a_form: 'You are invited to submit a form'
@@ -398,7 +400,6 @@ en: &en
   send_signature_request_emails_without_limits_with_docuseal_pro: Send signature request emails without limits with DocuSeal Pro
   count_emails_used: '%{count} emails used'
   has_been_connected: has been connected
-  but_not_activated: but not activated
   sms_not_configured: SMS not Configure
   configure_sms_settings_in_order_to_send_text_messages_: 'Configure SMS settings in order to send text messages:'
   go_to_sms_settings: Go to SMS settings
@@ -496,7 +497,6 @@ en: &en
   edit_user: Edit User
   new_user: New User
   unarchive: Unarchive
-  role: Role
   last_session: Last session
   unlock_more_user_roles_with_docuseal_pro: Unlock more user roles with DocuSeal Pro.
   view_active: View Active
@@ -563,8 +563,6 @@ en: &en
   new_webhook: New Webhook
   delete_webhook: Delete webhook
   count_submissions_have_been_created: '%{count} submissions have been created.'
-  gmail_has_been_connected: Gmail has been connected
-  microsoft_account_has_been_connected: Microsoft Account has been connected
   sms_length_cant_be_longer_than_120_bytes: SMS length can't be longer than 120 bytes
   connected_successfully: Connected successfully.
   user_nameid_not_found: 'User %{nameid} not found.'
@@ -783,6 +781,19 @@ en: &en
   email_verification: Email verification
   your_verification_code_to_access_the_name: 'Your verification code to access the "%{name}":'
   please_reply_to_this_email_if_you_didnt_request_this: Please reply to this email if you didn't request this.
+  advanced_settings: Advanced settings
+  text: Text
+  code: Code
+  custom_html_emails: Custom HTML emails
+  connect_your_email_to_send_html_emails: Connect your email to send HTML emails
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Connect your Gmail or Outlook account or add SMTP settings to send custom HTML emails.
+  connect_gmail_or_outlook: Connect Gmail or Outlook
+  connect_your_email_to_bulk_send: Connect your email to bulk send
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Connect your Gmail or Outlook account or add SMTP settings to bulk send.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: Are you sure you want to add recipients without sending? To send emails it requires to connect Gmail or Outlook.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" has been completed by <strong>{submission.submitters}</strong>'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Please check the copy of your "<strong>{template.name}</strong>" in the email attachments.'
+  you_have_been_invited_to_sign_the_template_name_html: 'You have been invited to sign the "<strong>{template.name}</strong>".'
   submission_sources:
     api: API
     bulk: Bulk Send
@@ -889,6 +900,10 @@ en: &en
       range_without_total: "%{from}-%{to} events"
 
 es: &es
+  party: Parte
+  edit_order: Edita Pedido
+  select: Seleccionar
+  invite_form_fields: Invitar campos del formulario
   pro: Pro
   default_parties: Partes predeterminadas
   authenticate_embedded_form_preview_with_token: Autenticar vista previa del formulario incrustado con token
@@ -922,8 +937,6 @@ es: &es
   team_access: Acceso del equipo
   remove_filter: Eliminar filtro
   document_download_filename_format: Formato del nombre del archivo de descarga del documento
-  document_name: Nombre del documento
-  unarchive: Desarchivar
   awaiting_completion_by_the_other_party: "Esperando la finalización por la otra parte"
   enforce_recipients_order: 'Hacer cumplir el orden de los destinatarios'
   first_party: 'Primera Parte'
@@ -944,7 +957,7 @@ es: &es
   please_check_the_copy_of_your_name_in_the_email_attachments: 'Por favor, revisa la copia de tu "%{name}" en los archivos adjuntos del correo electrónico.'
   review_and_sign: Revisar y Firmar
   review_and_submit: Revisar y Enviar
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: "Por favor, contáctanos respondiendo a este correo si tienes alguna pregunta."
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: "Por favor, contáctanos respondiendo a este correo si tienes alguna pregunta."
   submitter_invitation_sms_body_sign: '{account.name} te ha invitado a firmar un documento: {submitter.link}'
   verification_code_sms_body: 'Código de verificación: {code}'
   you_are_invited_to_submit_a_form: 'Estás invitado/a a enviar un formulario'
@@ -973,7 +986,7 @@ es: &es
   submitter_documents_copy_email_body: |
     Hola,
 
-    Por favor, revisa la copia de tu "{template.name}" en los archivos adjuntos.
+    Por favor, revisa la copia de tu "{template.name}" en los archivos adjuntos del correo electrónico.
     Alternativamente, puedes revisar y descargar tu copia usando el enlace a continuación:
 
     [{template.name}]({documents.link})
@@ -1268,7 +1281,6 @@ es: &es
   send_signature_request_emails_without_limits_with_docuseal_pro: Envía solicitudes de firma sin límites con DocuSeal Pro
   count_emails_used: '%{count} correos electrónicos utilizados'
   has_been_connected: ha sido conectado
-  but_not_activated: pero no activado
   sms_not_configured: SMS no configurado
   configure_sms_settings_in_order_to_send_text_messages_: 'Configura los ajustes de SMS para enviar mensajes de texto:'
   go_to_sms_settings: Ir a la configuración de SMS
@@ -1366,7 +1378,6 @@ es: &es
   edit_user: Editar usuario
   new_user: Nuevo usuario
   unarchive: Desarchivar
-  role: Rol
   last_session: Última sesión
   unlock_more_user_roles_with_docuseal_pro: Desbloquea más roles de usuario con DocuSeal Pro.
   view_active: Ver activos
@@ -1433,8 +1444,6 @@ es: &es
   new_webhook: Nuevo Webhook
   delete_webhook: Eliminar webhook
   count_submissions_have_been_created: '%{count} envíos han sido creados.'
-  gmail_has_been_connected: Gmail ha sido conectado.
-  microsoft_account_has_been_connected: La cuenta de Microsoft ha sido conectada.
   sms_length_cant_be_longer_than_120_bytes: La longitud del SMS no puede ser mayor a 120 bytes.
   connected_successfully: Conectado con éxito.
   user_nameid_not_found: 'Usuario %{nameid} no encontrado.'
@@ -1527,7 +1536,6 @@ es: &es
   select_field: Campo de Selección
   multiple_field: Campo Múltiple
   radio_field: Campo de Grupo Radio
-  radio_field: Campo de Radio
   cells_field: Campo de Celdas
   stamp_field: Campo de Sello
   payment_field: Campo de Pago
@@ -1653,6 +1661,19 @@ es: &es
   email_verification: Verificación por correo electrónico
   your_verification_code_to_access_the_name: 'Su código de verificación para acceder a "%{name}":'
   please_reply_to_this_email_if_you_didnt_request_this: Por favor, responda este correo si no solicitó esto.
+  advanced_settings: Configuración avanzada
+  text: Texto
+  code: Código
+  custom_html_emails: Correos electrónicos HTML personalizados
+  connect_your_email_to_send_html_emails: Conecta tu correo electrónico para enviar correos HTML
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Conecta tu cuenta de Gmail u Outlook o añade ajustes SMTP para enviar correos HTML personalizados.
+  connect_gmail_or_outlook: Conectar Gmail u Outlook
+  connect_your_email_to_bulk_send: Conecta tu correo electrónico para el envío masivo
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Conecta tu cuenta de Gmail u Outlook o añade ajustes SMTP para el envío masivo.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: ¿Estás seguro de que quieres añadir destinatarios sin enviar? Para enviar correos electrónicos necesitas conectar Gmail u Outlook.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" ha sido completado por <strong>{submission.submitters}</strong>'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Por favor, revisa la copia de tu "<strong>{template.name}</strong>" en los archivos adjuntos del correo electrónico.'
+  you_have_been_invited_to_sign_the_template_name_html: 'Has sido invitado a firmar el "<strong>{template.name}</strong>".'
   submission_sources:
     api: API
     bulk: Envío masivo
@@ -1759,6 +1780,10 @@ es: &es
       range_without_total: "%{from}-%{to} eventos"
 
 it: &it
+  party: Parte
+  edit_order: Modifica Ordine
+  select: Seleziona
+  invite_form_fields: Invita campi modulo
   pro: Pro
   default_parties: Parti predefiniti
   authenticate_embedded_form_preview_with_token: "Autentica l'anteprima del modulo incorporato con il token"
@@ -1791,8 +1816,6 @@ it: &it
   team_access: Accesso al team
   remove_filter: Rimuovi filtro
   document_download_filename_format: Formato del nome file scaricato
-  document_name: Nome del Documento
-  unarchive: Ripristina
   awaiting_completion_by_the_other_party: "In attesa di completamento da parte dell'altra parte"
   enforce_recipients_order: "Applicare l'ordine dei destinatari"
   first_party: 'Prima parte'
@@ -1813,7 +1836,7 @@ it: &it
   please_check_the_copy_of_your_name_in_the_email_attachments: "Per favore, controlla la copia del tuo \"%{name}\" negli allegati dell'email."
   review_and_sign: Rivedi e Firma
   review_and_submit: Rivedi e Invia
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: "Per favore, contattaci rispondendo a questa email se hai domande."
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: "Per favore, contattaci rispondendo a questa email se hai domande."
   submitter_invitation_sms_body_sign: '{account.name} ti ha invitato a firmare un documento: {submitter.link}'
   verification_code_sms_body: 'Codice di verifica: {code}'
   you_are_invited_to_submit_a_form: 'Sei stato invitato a inviare un modulo'
@@ -2137,7 +2160,6 @@ it: &it
   send_signature_request_emails_without_limits_with_docuseal_pro: Invia email di richiesta di firma senza limiti con DocuSeal Pro
   count_emails_used: '%{count} email utilizzate'
   has_been_connected: è stato connesso
-  but_not_activated: ma non attivato
   sms_not_configured: SMS non configurato
   configure_sms_settings_in_order_to_send_text_messages_: 'Configura le impostazioni SMS per inviare messaggi di testo:'
   go_to_sms_settings: Vai alle impostazioni SMS
@@ -2234,7 +2256,6 @@ it: &it
   edit_user: Modifica utente
   new_user: Nuovo utente
   unarchive: Disarchivia
-  role: Ruolo
   last_session: Ultima sessione
   unlock_more_user_roles_with_docuseal_pro: Sblocca più ruoli utente con DocuSeal Pro.
   view_active: Visualizza attivi
@@ -2301,8 +2322,6 @@ it: &it
   new_webhook: Nuovo Webhook
   delete_webhook: Elimina webhook
   count_submissions_have_been_created: '%{count} invii sono stati creati.'
-  gmail_has_been_connected: Gmail è stato connesso.
-  microsoft_account_has_been_connected: "L'account Microsoft è stato connesso."
   sms_length_cant_be_longer_than_120_bytes: "La lunghezza dell'SMS non può superare i 120 byte."
   connected_successfully: Collegamento avvenuto con successo.
   user_nameid_not_found: 'Utente %{nameid} non trovato.'
@@ -2522,6 +2541,19 @@ it: &it
   email_verification: Verifica email
   your_verification_code_to_access_the_name: 'Il tuo codice per accedere a "%{name}":'
   please_reply_to_this_email_if_you_didnt_request_this: Rispondi a questa email se non hai richiesto questo.
+  advanced_settings: Impostazioni avanzate
+  text: Testo
+  code: Codice
+  custom_html_emails: Email HTML personalizzate
+  connect_your_email_to_send_html_emails: Collega la tua email per inviare email HTML
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Collega il tuo account Gmail o Outlook oppure aggiungi impostazioni SMTP per inviare email HTML personalizzate.
+  connect_gmail_or_outlook: Collega Gmail o Outlook
+  connect_your_email_to_bulk_send: Collega la tua email per invio multiplo
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Collega il tuo account Gmail o Outlook oppure aggiungi impostazioni SMTP per invio multiplo.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: Sei sicuro di voler aggiungere destinatari senza inviare? Per inviare email devi collegare Gmail o Outlook.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" è stato completato da <strong>{submission.submitters}</strong>'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Per favore, controlla la copia del tuo "<strong>{template.name}</strong>" negli allegati dell''email.'
+  you_have_been_invited_to_sign_the_template_name_html: 'Sei stato invitato a firmare il "<strong>{template.name}</strong>".'
   submission_sources:
     api: API
     bulk: Invio massivo
@@ -2628,6 +2660,10 @@ it: &it
       range_without_total: "%{from}-%{to} eventi"
 
 fr: &fr
+  party: Partie
+  edit_order: Modifier la commande
+  select: Sélectionner
+  invite_form_fields: Inviter des champs de formulaire
   pro: Pro
   default_parties: Parties par défaut
   authenticate_embedded_form_preview_with_token: Authentifier l’aperçu du formulaire intégré avec un jeton
@@ -2661,8 +2697,6 @@ fr: &fr
   team_access: Accès à l'équipe
   remove_filter: Supprimer le filtre
   document_download_filename_format: Format du nom de fichier du téléchargement de document
-  document_name: Nom du document
-  unarchive: Désarchiver
   awaiting_completion_by_the_other_party: "En attente de la complétion par l'autre partie"
   enforce_recipients_order: "Respecter l'ordre des destinataires"
   first_party: 'Première partie'
@@ -2683,7 +2717,7 @@ fr: &fr
   please_check_the_copy_of_your_name_in_the_email_attachments: "Veuillez vérifier la copie de votre \"%{name}\" dans les pièces jointes de l'email."
   review_and_sign: Consulter et signer
   review_and_submit: Consulter et soumettre
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: 'Veuillez nous contacter en répondant à cet e-mail si vous avez des questions.'
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: 'Veuillez nous contacter en répondant à cet e-mail si vous avez des questions.'
   submitter_invitation_sms_body_sign: '{account.name} vous a invité à signer un document: {submitter.link}'
   verification_code_sms_body: 'Code de vérification: {code}'
   you_are_invited_to_submit_a_form: Vous êtes invité à soumettre un formulaire
@@ -2699,7 +2733,7 @@ fr: &fr
 
     [Consulter et signer]({submitter.link})
 
-    Veuillez nous contacter si vous avez des questions.
+    Veuillez nous contacter en répondant à cet e-mail si vous avez des questions.
 
     Merci,
     {account.name}
@@ -2712,7 +2746,7 @@ fr: &fr
   submitter_documents_copy_email_body: |
     Bonjour,
 
-    Veuillez vérifier la copie de votre "{template.name}" dans les pièces jointes.
+    Veuillez vérifier la copie de votre "{template.name}" dans les pièces jointes de l'email.
     Vous pouvez également consulter et télécharger votre copie en utilisant le lien ci-dessous:
 
     [{template.name}]({documents.link})
@@ -3008,7 +3042,6 @@ fr: &fr
   send_signature_request_emails_without_limits_with_docuseal_pro: Envoyez des e-mails de demande de signature sans limites avec DocuSeal Pro
   count_emails_used: '%{count} e-mails utilisés'
   has_been_connected: a été connecté
-  but_not_activated: mais pas activé
   sms_not_configured: SMS non configuré
   configure_sms_settings_in_order_to_send_text_messages_: 'Configurez les paramètres SMS pour envoyer des messages texte'
   go_to_sms_settings: Aller aux paramètres SMS
@@ -3106,7 +3139,6 @@ fr: &fr
   edit_user: "Modifier l'utilisateur"
   new_user: Nouvel utilisateur
   unarchive: Désarchiver
-  role: Rôle
   last_session: Dernière session
   unlock_more_user_roles_with_docuseal_pro: Déverrouillez plus de rôles d'utilisateurs avec DocuSeal Pro.
   view_active: Voir les actifs
@@ -3173,8 +3205,6 @@ fr: &fr
   new_webhook: Nouveau Webhook
   delete_webhook: Supprimer le webhook
   count_submissions_have_been_created: '%{count} soumissions ont été créées.'
-  gmail_has_been_connected: Gmail a été connecté.
-  microsoft_account_has_been_connected: Le compte Microsoft a été connecté.
   sms_length_cant_be_longer_than_120_bytes: La longueur du SMS ne peut pas dépasser 120 octets.
   connected_successfully: Connecté avec succès.
   user_nameid_not_found: 'Utilisateur %{nameid} introuvable.'
@@ -3394,6 +3424,19 @@ fr: &fr
   email_verification: Vérification de l'email
   your_verification_code_to_access_the_name: 'Votre code pour accéder à "%{name}" :'
   please_reply_to_this_email_if_you_didnt_request_this: Veuillez répondre à cet email si vous n'avez pas fait cette demande.
+  advanced_settings: Paramètres avancés
+  text: Texte
+  code: Code
+  custom_html_emails: E-mails HTML personnalisés
+  connect_your_email_to_send_html_emails: Connectez votre e-mail pour envoyer des e-mails HTML
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Connectez votre compte Gmail ou Outlook ou ajoutez des paramètres SMTP pour envoyer des e-mails HTML personnalisés.
+  connect_gmail_or_outlook: Connecter Gmail ou Outlook
+  connect_your_email_to_bulk_send: Connectez votre e-mail pour l'envoi groupé
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Connectez votre compte Gmail ou Outlook ou ajoutez des paramètres SMTP pour l'envoi groupé.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: Êtes-vous sûr de vouloir ajouter des destinataires sans envoi ? Pour envoyer des e-mails, vous devez connecter Gmail ou Outlook.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" a été complété par <strong>{submission.submitters}</strong>'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Veuillez vérifier la copie de votre "<strong>{template.name}</strong>" dans les pièces jointes de l’e-mail.'
+  you_have_been_invited_to_sign_the_template_name_html: 'Vous avez été invité à signer le "<strong>{template.name}</strong>".'
   submission_sources:
     api: API
     bulk: Envoi en masse
@@ -3500,6 +3543,10 @@ fr: &fr
       range_without_total: "%{from} à %{to} événements"
 
 pt: &pt
+  party: Parte
+  edit_order: Edita Pedido
+  select: Selecionar
+  invite_form_fields: Convidar campos do formulário
   pro: Pro
   default_parties: Partes padrão
   authenticate_embedded_form_preview_with_token: Autenticar visualização incorporada do formulário com token
@@ -3533,8 +3580,6 @@ pt: &pt
   team_access: Acesso à equipe
   remove_filter: Remover filtro
   document_download_filename_format: Formato do nome do arquivo de download do documento
-  document_name: Nome do documento
-  unarchive: Desarquivar
   awaiting_completion_by_the_other_party: "Aguardando a conclusão pela outra parte"
   enforce_recipients_order: 'Forçar a ordem dos recipientes'
   first_party: 'Primeira Parte'
@@ -3555,7 +3600,7 @@ pt: &pt
   please_check_the_copy_of_your_name_in_the_email_attachments: 'Por favor, verifique a cópia de "%{name}" nos anexos do e-mail.'
   review_and_sign: Revisar e assinar
   review_and_submit: Revisar e submeter
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: 'Por favor, entre em contato conosco respondendo a este e-mail se você tiver alguma dúvida.'
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: 'Por favor, entre em contato conosco respondendo a este e-mail se você tiver alguma dúvida.'
   submitter_invitation_sms_body_sign: '{account.name} convidou você para assinar um documento: {submitter.link}'
   verification_code_sms_body: 'Código de verificação: {code}'
   you_are_invited_to_submit_a_form: Você foi convidado a submeter um formulário
@@ -3567,11 +3612,11 @@ pt: &pt
   submitter_invitation_email_sign_body: |
     Olá,
 
-    Você foi convidado a assinar o documento "{template.name}".
+    Você foi convidado a assinar "{template.name}".
 
     [Revisar e assinar]({submitter.link})
 
-    Por favor, entre em contato conosco se tiver alguma dúvida.
+    Por favor, entre em contato conosco respondendo a este e-mail se você tiver alguma dúvida.
 
     Obrigado,
     {account.name}
@@ -3584,8 +3629,8 @@ pt: &pt
   submitter_documents_copy_email_body: |
     Olá,
 
-    Por favor, verifique a cópia de seu "{template.name}" nos anexos do e-mail.
+    Por favor, verifique a cópia de "{template.name}" nos anexos do e-mail.
-    Alternativamente, você pode revisar e baixar sua cópia usando o link abaixo:
+    Você pode revisar e baixar sua cópia usando o link abaixo:
 
     [{template.name}]({documents.link})
 
@@ -3879,7 +3924,6 @@ pt: &pt
   send_signature_request_emails_without_limits_with_docuseal_pro: Enviar e-mails de solicitação de assinatura sem limites com o DocuSeal Pro
   count_emails_used: '%{count} e-mails usados'
   has_been_connected: foi conectado
-  but_not_activated: mas não ativado
   sms_not_configured: SMS não configurado
   configure_sms_settings_in_order_to_send_text_messages_: 'Configure as configurações de SMS para enviar mensagens de texto:'
   go_to_sms_settings: Ir para configurações de SMS
@@ -3977,7 +4021,6 @@ pt: &pt
   edit_user: Editar usuário
   new_user: Novo usuário
   unarchive: Desarquivar
-  role: Função
   last_session: Última sessão
   unlock_more_user_roles_with_docuseal_pro: Desbloqueie mais funções de usuário com DocuSeal Pro.
   view_active: Ver ativos
@@ -4044,8 +4087,6 @@ pt: &pt
   new_webhook: Novo Webhook
   delete_webhook: Excluir webhook
   count_submissions_have_been_created: '%{count} submissões foram criadas.'
-  gmail_has_been_connected: O Gmail foi conectado
-  microsoft_account_has_been_connected: A conta da Microsoft foi conectada
   sms_length_cant_be_longer_than_120_bytes: O comprimento do SMS não pode ultrapassar 120 bytes
   connected_successfully: Conectado com sucesso.
   user_nameid_not_found: 'Usuário %{nameid} não encontrado.'
@@ -4264,6 +4305,19 @@ pt: &pt
   email_verification: Verificação de e-mail
   your_verification_code_to_access_the_name: 'Seu código de verificação para acessar "%{name}":'
   please_reply_to_this_email_if_you_didnt_request_this: Responda a este e-mail se você não solicitou isso.
+  advanced_settings: Configurações avançadas
+  text: Texto
+  code: Código
+  custom_html_emails: E-mails HTML personalizados
+  connect_your_email_to_send_html_emails: Conecte seu e-mail para enviar e-mails HTML
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Conecte sua conta Gmail ou Outlook ou adicione configurações SMTP para enviar e-mails HTML personalizados.
+  connect_gmail_or_outlook: Conectar Gmail ou Outlook
+  connect_your_email_to_bulk_send: Conecte seu e-mail para envio em massa
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Conecte sua conta Gmail ou Outlook ou adicione configurações SMTP para envio em massa.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: Tem certeza de que deseja adicionar destinatários sem enviar? Para enviar e-mails é necessário conectar Gmail ou Outlook.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" foi concluído por <strong>{submission.submitters}</strong>'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Por favor, verifique a cópia do seu "<strong>{template.name}</strong>" nos anexos do e-mail.'
+  you_have_been_invited_to_sign_the_template_name_html: 'Você foi convidado a assinar o "<strong>{template.name}</strong>".'
   submission_sources:
     api: API
     bulk: Envio em massa
@@ -4344,7 +4398,6 @@ pt: &pt
     settings_account_description: 'Com configurações completas de conta, você pode personalizar a experiência de assinatura eletrônica e convidar mais usuários.'
     support: 'Suporte'
     support_description: 'Você pode usar nosso assistente de IA ou nos escrever para support@docuseal.com se tiver dúvidas.'
-    settings: 'Configurações'
     settings_template_description: 'Use este botão para acessar a página de configurações da sua conta.'
   doorkeeper:
     scopes:
@@ -4371,6 +4424,10 @@ pt: &pt
       range_without_total: "%{from}-%{to} eventos"
 
 de: &de
+  party: Partei
+  edit_order: Bestellung bearbeiten
+  select: Auswählen
+  invite_form_fields: Formularfelder einladen
   pro: Pro
   default_parties: Standardparteien
   authenticate_embedded_form_preview_with_token: Authentifizieren Sie die eingebettete Formularvorschau mit Token
@@ -4404,8 +4461,6 @@ de: &de
   team_access: Teamzugang
   remove_filter: Filter entfernen
   document_download_filename_format: Format des Dateinamens beim Herunterladen von Dokumenten
-  document_name: Dokumentname
-  unarchive: Wiederherstellen
   awaiting_completion_by_the_other_party: "Warten auf die Fertigstellung durch die andere Partei"
   enforce_recipients_order: 'Empfängerreihenfolge durchsetzen'
   first_party: 'Erste Partei'
@@ -4426,7 +4481,7 @@ de: &de
   please_check_the_copy_of_your_name_in_the_email_attachments: 'Bitte überprüfe die Kopie von "%{name}" im E-Mail-Anhang.'
   review_and_sign: Überprüfen und unterschreiben
   review_and_submit: Überprüfen und einreichen
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: 'Bitte kontaktiere uns, indem du auf diese E-Mail antwortest, falls du Fragen hast.'
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: 'Bitte kontaktieren Sie uns, indem Sie auf diese E-Mail antworten, falls Sie Fragen haben.'
   submitter_invitation_sms_body_sign: '{account.name} hat dich eingeladen, ein Dokument zu unterschreiben: {submitter.link}'
   verification_code_sms_body: 'Verifizierungscode: {code}'
   you_are_invited_to_submit_a_form: Du wurdest eingeladen, ein Formular einzureichen
@@ -4438,11 +4493,11 @@ de: &de
   submitter_invitation_email_sign_body: |
     Hallo,
 
-    Du wurdest eingeladen, das Dokument "{template.name}" zu unterschreiben.
+    Du wurdest eingeladen, "{template.name}" zu unterschreiben.
 
     [Überprüfen und unterschreiben]({submitter.link})
 
-    Bitte kontaktiere uns, falls du Fragen hast.
+    Bitte kontaktieren Sie uns, indem Sie auf diese E-Mail antworten, falls Sie Fragen haben.
 
     Danke,
     {account.name}
@@ -4455,8 +4510,8 @@ de: &de
   submitter_documents_copy_email_body: |
     Hallo,
 
-    Bitte überprüfe die Kopie deines "{template.name}" im E-Mail-Anhang.
+    Bitte überprüfe die Kopie von "{template.name}" im E-Mail-Anhang.
-    Alternativ kannst du deine Kopie mit dem untenstehenden Link überprüfen und herunterladen:
+    Du kannst alternativ deine Kopie mit dem untenstehenden Link überprüfen und herunterladen:
 
     [{template.name}]({documents.link})
 
@@ -4750,7 +4805,6 @@ de: &de
   send_signature_request_emails_without_limits_with_docuseal_pro: Unterschriftsanfragen ohne Limits mit DocuSeal Pro senden
   count_emails_used: '%{count} E-Mails verwendet'
   has_been_connected: wurde verbunden
-  but_not_activated: aber nicht aktiviert
   sms_not_configured: SMS nicht konfiguriert
   configure_sms_settings_in_order_to_send_text_messages_: 'Konfiguriere die SMS-Einstellungen, um Textnachrichten zu senden:'
   go_to_sms_settings: Zu den SMS-Einstellungen gehen
@@ -4848,7 +4902,6 @@ de: &de
   edit_user: Benutzer bearbeiten
   new_user: Neuer Benutzer
   unarchive: Entarchivieren
-  role: Rolle
   last_session: Letzte Sitzung
   unlock_more_user_roles_with_docuseal_pro: Weitere Benutzerrollen mit DocuSeal Pro freischalten.
   view_active: Aktive anzeigen
@@ -4915,8 +4968,6 @@ de: &de
   new_webhook: Neuer Webhook
   delete_webhook: Webhook löschen
   count_submissions_have_been_created: '%{count} Einreichungen wurden erstellt.'
-  gmail_has_been_connected: Gmail wurde verbunden.
-  microsoft_account_has_been_connected: Microsoft-Konto wurde verbunden.
   sms_length_cant_be_longer_than_120_bytes: Die SMS-Länge darf 120 Bytes nicht überschreiten.
   connected_successfully: Erfolgreich verbunden.
   user_nameid_not_found: 'Benutzer %{nameid} nicht gefunden.'
@@ -5135,6 +5186,19 @@ de: &de
   email_verification: E-Mail-Verifizierung
   your_verification_code_to_access_the_name: 'Ihr Verifizierungscode für den Zugriff auf "%{name}":'
   please_reply_to_this_email_if_you_didnt_request_this: Antworten Sie auf diese E-Mail, wenn Sie dies nicht angefordert haben.
+  advanced_settings: Erweiterte Einstellungen
+  text: Text
+  code: Code
+  custom_html_emails: Benutzerdefinierte HTML-E-Mails
+  connect_your_email_to_send_html_emails: Verbinden Sie Ihr E-Mail-Konto, um HTML-E-Mails zu senden
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Verbinden Sie Ihr Gmail- oder Outlook-Konto oder fügen Sie SMTP-Einstellungen hinzu, um benutzerdefinierte HTML-E-Mails zu senden.
+  connect_gmail_or_outlook: Gmail oder Outlook verbinden
+  connect_your_email_to_bulk_send: Verbinden Sie Ihr E-Mail-Konto für Massenversand
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Verbinden Sie Ihr Gmail- oder Outlook-Konto oder fügen Sie SMTP-Einstellungen für den Massenversand hinzu.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: Möchten Sie wirklich Empfänger hinzufügen, ohne zu senden? Zum Senden von E-Mails ist eine Verbindung zu Gmail oder Outlook erforderlich.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" wurde von <strong>{submission.submitters}</strong> abgeschlossen'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Bitte prüfen Sie die Kopie Ihres "<strong>{template.name}</strong>" in den E-Mail-Anhängen.'
+  you_have_been_invited_to_sign_the_template_name_html: 'Du wurdest eingeladen, "<strong>{template.name}</strong>" zu unterschreiben.'
   submission_sources:
     api: API
     bulk: Massenversand

config/routes.rb

@@ -108,6 +108,7 @@ Rails.application.routes.draw do
     resource :preferences, only: %i[show create], controller: 'templates_preferences'
     resource :share_link, only: %i[show create], controller: 'templates_share_link'
     resources :recipients, only: %i[create], controller: 'templates_recipients'
+    resources :prefillable_fields, only: %i[create], controller: 'templates_prefillable_fields'
     resources :submissions_export, only: %i[index new]
   end
   resources :preview_document_page, only: %i[show], path: '/preview/:signed_uuid'

db/migrate/20240816072859_populate_submitter_account_id.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PopulateSubmitterAccountId < ActiveRecord::Migration[7.1]
-  disable_ddl_transaction
+  disable_ddl_transaction!
 
   class MigrationSubmitter < ApplicationRecord
     self.table_name = 'submitters'

db/migrate/20241022125135_populate_completed_submitters_and_documents.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PopulateCompletedSubmittersAndDocuments < ActiveRecord::Migration[7.2]
-  disable_ddl_transaction
+  disable_ddl_transaction!
 
   class MigrationSubmitter < ApplicationRecord
     self.table_name = 'submitters'

db/migrate/20241029192232_populate_webhook_urls.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PopulateWebhookUrls < ActiveRecord::Migration[7.2]
-  disable_ddl_transaction
+  disable_ddl_transaction!
 
   class MigrationWebhookUrl < ActiveRecord::Base
     self.table_name = 'webhook_urls'

db/migrate/20250523121121_add_shared_link_to_templates.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddSharedLinkToTemplates < ActiveRecord::Migration[8.0]
-  disable_ddl_transaction
+  disable_ddl_transaction!
 
   class MigrationTemplate < ActiveRecord::Base
     self.table_name = 'templates'

db/migrate/20250603105556_create_search_enties.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 class CreateSearchEnties < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
   def up
     return unless adapter_name == 'PostgreSQL'
 
-    enable_extension 'btree_gin'
-
     create_table :search_entries do |t|
       t.references :record, null: false, polymorphic: true, index: false
       t.bigint :account_id, null: false
@@ -14,12 +14,24 @@ class CreateSearchEnties < ActiveRecord::Migration[8.0]
       t.timestamps
     end
 
-    add_index :search_entries, %i[account_id tsvector], using: :gin, where: "record_type = 'Submitter'",
+    begin
-                                                        name: 'index_search_entries_on_account_id_tsvector_submitter'
+      enable_extension 'btree_gin'
-    add_index :search_entries, %i[account_id tsvector], using: :gin, where: "record_type = 'Submission'",
+    rescue StandardError
-                                                        name: 'index_search_entries_on_account_id_tsvector_submission'
+      nil
-    add_index :search_entries, %i[account_id tsvector], using: :gin, where: "record_type = 'Template'",
+    end
-                                                        name: 'index_search_entries_on_account_id_tsvector_template'
+
+    btree_gin_enabled = extension_enabled?('btree_gin')
+
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
+              using: :gin, where: "record_type = 'Submitter'",
+              name: 'index_search_entries_on_account_id_tsvector_submitter'
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
+              using: :gin, where: "record_type = 'Submission'",
+              name: 'index_search_entries_on_account_id_tsvector_submission'
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
+              using: :gin, where: "record_type = 'Template'",
+              name: 'index_search_entries_on_account_id_tsvector_template'
+
     add_index :search_entries, %i[record_id record_type], unique: true
   end
 
@@ -28,6 +40,10 @@ class CreateSearchEnties < ActiveRecord::Migration[8.0]
 
     drop_table :search_entries
 
-    disable_extension 'btree_gin'
+    begin
+      disable_extension 'btree_gin'
+    rescue StandardError
+      nil
+    end
   end
 end

db/migrate/20250608163157_add_ngram_to_search_index.rb

@@ -4,13 +4,18 @@ class AddNgramToSearchIndex < ActiveRecord::Migration[8.0]
   def change
     return unless adapter_name == 'PostgreSQL'
 
+    btree_gin_enabled = extension_enabled?('btree_gin')
+
     add_column :search_entries, :ngram, :tsvector
 
-    add_index :search_entries, %i[account_id ngram], using: :gin, where: "record_type = 'Submitter'",
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
-                                                     name: 'index_search_entries_on_account_id_ngram_submitter'
+              using: :gin, where: "record_type = 'Submitter'",
-    add_index :search_entries, %i[account_id ngram], using: :gin, where: "record_type = 'Submission'",
+              name: 'index_search_entries_on_account_id_ngram_submitter'
-                                                     name: 'index_search_entries_on_account_id_ngram_submission'
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
-    add_index :search_entries, %i[account_id ngram], using: :gin, where: "record_type = 'Template'",
+              using: :gin, where: "record_type = 'Submission'",
-                                                     name: 'index_search_entries_on_account_id_ngram_template'
+              name: 'index_search_entries_on_account_id_ngram_submission'
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
+              using: :gin, where: "record_type = 'Template'",
+              name: 'index_search_entries_on_account_id_ngram_template'
   end
 end

lib/accounts.rb

@@ -53,8 +53,11 @@ module Accounts
     ApplicationRecord.transaction do
       account.testing_accounts << testing_account
 
+      original_email = account.users.order(:id).first.email
+      test_email = generate_unique_test_email(original_email)
+
       testing_account.users.create!(
-        email: account.users.order(:id).first.email.sub('@', '+test@'),
+        email: test_email,
         first_name: 'Testing',
         last_name: 'Environment',
         password: SecureRandom.hex,
@@ -63,6 +66,22 @@ module Accounts
     end
   end
 
+  def generate_unique_test_email(original_email)
+    base_email = original_email.sub('@', '+test@')
+
+    return base_email unless User.exists?(email: base_email)
+
+    (1..3).each do |i|
+      test_email = original_email.sub('@', "+test#{i}@")
+
+      return test_email unless User.exists?(email: test_email)
+    end
+
+    timestamp = Time.current.to_i
+
+    original_email.sub('@', "+test#{timestamp}@")
+  end
+
   def create_default_template(account)
     template = Template.find(1)
 

lib/image_utils.rb

@@ -14,4 +14,12 @@ module ImageUtils
 
     false
   end
+
+  def error?(image)
+    image = image.crop(0, 0, image.width / 4, 2)
+
+    row1, row2 = image.to_a
+
+    row1[3..] == row2[..-4] && row1.each_cons(2).none? { |a, b| a == b }
+  end
 end

lib/params/submission_create_validator.rb

@@ -76,6 +76,7 @@ module Params
       type(submitter_params, :name, String)
       type(submitter_params, :reply_to, String)
       type(submitter_params, :email, String)
+      type(submitter_params, :order, Integer)
       email_format(submitter_params, :email, message: 'email is invalid')
       email_format(submitter_params, :reply_to, message: 'reply_to email is invalid')
       type(submitter_params, :phone, String)

lib/submissions.rb

@@ -142,15 +142,23 @@ module Submissions
     submissions.each_with_index do |submission, index|
       delay_seconds = (delay + index).seconds if delay
 
-      submitters = submission.submitters.reject(&:completed_at?)
+      template_submitters = submission.template_submitters
+      submitters_index = submission.submitters.reject(&:completed_at?).index_by(&:uuid)
 
-      if submission.submitters_order_preserved?
+      if template_submitters.any? { |s| s['order'] }
-        first_submitter =
+        min_order = template_submitters.map.with_index { |s, i| s['order'] || i }.min
-          submission.template_submitters.filter_map { |s| submitters.find { |e| e.uuid == s['uuid'] } }.first
+
+        first_submitters = template_submitters.filter_map do |s|
+          submitters_index[s['uuid']] if s['order'] == min_order
+        end
+
+        Submitters.send_signature_requests(first_submitters, delay_seconds:)
+      elsif submission.submitters_order_preserved?
+        first_submitter = template_submitters.filter_map { |s| submitters_index[s['uuid']] }.first
 
         Submitters.send_signature_requests([first_submitter], delay_seconds:) if first_submitter
       else
-        Submitters.send_signature_requests(submitters, delay_seconds:)
+        Submitters.send_signature_requests(submitters_index.values, delay_seconds:)
       end
     end
   end

lib/submissions/create_from_submitters.rb

@@ -52,9 +52,12 @@ module Submissions
             template_submitter = template_submitters.find { |e| e['uuid'] == uuid }
           end
 
-          submission.template_submitters << template_submitter.except('optional_invite_by_uuid', 'invite_by_uuid')
+          template_submitter = template_submitter.except('optional_invite_by_uuid', 'invite_by_uuid')
+          template_submitter['order'] = submitter_attrs['order'] if submitter_attrs['order'].present?
 
-          is_order_sent = submitters_order == 'random' || index.zero?
+          submission.template_submitters << template_submitter
+
+          is_order_sent = submitters_order == 'random' || (template_submitter['order'] || index).zero?
 
           build_submitter(submission:, attrs: submitter_attrs,
                           uuid:, is_order_sent:, user:, params:,

lib/submitters.rb

@@ -162,12 +162,25 @@ module Submitters
   end
 
   def current_submitter_order?(submitter)
-    submitter_items = submitter.submission.template_submitters || submitter.submission.template.submitters
+    submission = submitter.submission
 
-    before_items = submitter_items[0...(submitter_items.find_index { |e| e['uuid'] == submitter.uuid })]
+    submitter_items = submission.template_submitters || submission.template.submitters
 
-    before_items.reduce(true) do |acc, item|
+    before_items =
-      acc && submitter.submission.submitters.find { |e| e.uuid == item['uuid'] }&.completed_at?
+      if submitter_items.any? { |s| s['order'] }
+        submitter_groups = submitter_items.group_by.with_index { |s, index| s['order'] || index }.sort_by(&:first)
+
+        current_group_index = submitter_groups.find_index { |_, group| group.any? { |s| s['uuid'] == submitter.uuid } }
+
+        submitter_groups.first(current_group_index).flat_map(&:last)
+      else
+        submitter_items.first(submitter_items.find_index { |e| e['uuid'] == submitter.uuid })
+      end
+
+    before_items.all? do |item|
+      submitter = submission.submitters.find { |e| e.uuid == item['uuid'] }
+
+      submitter.nil? || submitter.completed_at?
     end
   end
 

lib/submitters/submit_values.rb

@@ -8,6 +8,14 @@ module Submitters
     VARIABLE_REGEXP = /\{\{?(\w+)\}\}?/
     NONEDITABLE_FIELD_TYPES = %w[stamp heading].freeze
 
+    STRFTIME_MAP = {
+      'hour' => '%-k',
+      'minute' => '%M',
+      'day' => '%-d',
+      'month' => '%-m',
+      'year' => '%Y'
+    }.freeze
+
     module_function
 
     def call(submitter, params, request, validate_required: true)
@@ -327,12 +335,10 @@ module Submitters
           else
             e
           end
+        when 'hour', 'minute', 'day', 'month', 'year'
+          with_time ? Time.current.in_time_zone(submission.account.timezone).strftime(STRFTIME_MAP[key]) : e
         when 'date'
-          if with_time
+          with_time ? Time.current.in_time_zone(submission.account.timezone).to_date.to_s : e
-            Time.current.in_time_zone(submission.account.timezone).to_date.to_s
-          else
-            e
-          end
         when 'role', 'email', 'phone', 'name'
           attrs[key] || e
         else

lib/template_folders.rb

@@ -4,7 +4,9 @@ module TemplateFolders
   module_function
 
   def filter_by_full_name(template_folders, name)
-    parent_name, name = name.split(' / ', 2).map(&:squish)
+    return template_folders.none if name.blank?
+
+    parent_name, name = name.to_s.split(' / ', 2).map(&:squish)
 
     if name.present?
       parent_folder = template_folders.where(parent_folder_id: nil).find_by(name: parent_name)
@@ -75,7 +77,7 @@ module TemplateFolders
   def find_or_create_by_name(author, name)
     return author.account.default_template_folder if name.blank? || name == TemplateFolder::DEFAULT_NAME
 
-    parent_name, name = name.split(' / ', 2).map(&:squish)
+    parent_name, name = name.to_s.split(' / ', 2).map(&:squish)
 
     if name.present?
       parent_folder = author.account.template_folders.create_with(author:)

lib/templates/create_attachments.rb

@@ -3,6 +3,20 @@
 module Templates
   module CreateAttachments
     PDF_CONTENT_TYPE = 'application/pdf'
+    ZIP_CONTENT_TYPE = 'application/zip'
+    X_ZIP_CONTENT_TYPE = 'application/x-zip-compressed'
+    JSON_CONTENT_TYPE = 'application/json'
+    DOCUMENT_EXTENSIONS = %w[.docx .doc .xlsx .xls .odt .rtf].freeze
+
+    DOCUMENT_CONTENT_TYPES = %w[
+      application/vnd.openxmlformats-officedocument.wordprocessingml.document
+      application/msword
+      application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+      application/vnd.ms-excel
+      application/vnd.oasis.opendocument.text
+      application/rtf
+    ].freeze
+
     ANNOTATIONS_SIZE_LIMIT = 6.megabytes
     InvalidFileType = Class.new(StandardError)
     PdfEncrypted = Class.new(StandardError)
@@ -10,7 +24,7 @@ module Templates
     module_function
 
     def call(template, params, extract_fields: false)
-      Array.wrap(params[:files].presence || params[:file]).map do |file|
+      extract_zip_files(params[:files].presence || params[:file]).flat_map do |file|
         handle_file_types(template, file, params, extract_fields:)
       end
     end
@@ -53,6 +67,40 @@ module Templates
       raise PdfEncrypted
     end
 
+    def extract_zip_files(files)
+      extracted_files = []
+
+      Array.wrap(files).each do |file|
+        if file.content_type == ZIP_CONTENT_TYPE || file.content_type == X_ZIP_CONTENT_TYPE
+          Zip::File.open(file.tempfile).each do |entry|
+            next if entry.directory?
+
+            tempfile = Tempfile.new(entry.name)
+            tempfile.binmode
+            entry.get_input_stream { |in_stream| IO.copy_stream(in_stream, tempfile) }
+            tempfile.rewind
+
+            type = Marcel::MimeType.for(tempfile, name: entry.name)
+
+            next if type.exclude?('image') &&
+                    type != PDF_CONTENT_TYPE &&
+                    type != JSON_CONTENT_TYPE &&
+                    DOCUMENT_CONTENT_TYPES.exclude?(type)
+
+            extracted_files << ActionDispatch::Http::UploadedFile.new(
+              filename: File.basename(entry.name),
+              type:,
+              tempfile:
+            )
+          end
+        else
+          extracted_files << file
+        end
+      end
+
+      extracted_files
+    end
+
     def handle_file_types(template, file, params, extract_fields:)
       if file.content_type.include?('image') || file.content_type == PDF_CONTENT_TYPE
         return handle_pdf_or_image(template, file, file.read, params, extract_fields:)

package.json

@@ -6,10 +6,12 @@
     "@babel/plugin-transform-runtime": "7.21.4",
     "@babel/preset-env": "7.21.5",
     "@babel/runtime": "7.21.5",
+    "@codemirror/lang-html": "^6.4.9",
     "@eid-easy/eideasy-widget": "^2.163.4",
     "@github/catalyst": "^2.0.0-beta",
     "@hotwired/turbo": "https://github.com/docusealco/turbo#main",
     "@hotwired/turbo-rails": "^7.3.0",
+    "@specious/htmlflow": "^1.1.0",
     "@tabler/icons-vue": "^2.47.0",
     "autocompleter": "^9.1.0",
     "autoprefixer": "^10.4.14",
@@ -17,6 +19,7 @@
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-macros": "^3.1.0",
     "canvas-confetti": "^1.6.0",
+    "codemirror": "^6.0.2",
     "compression-webpack-plugin": "10.0.0",
     "css-loader": "^6.7.3",
     "css-minimizer-webpack-plugin": "^5.0.0",