update rubocop

Bumps the bundler group with 1 update in the / directory: [devise-two-factor](https://github.com/tinfoil/devise-two-factor).


Updates `devise-two-factor` from 5.0.0 to 6.0.0
- [Changelog](https://github.com/devise-two-factor/devise-two-factor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tinfoil/devise-two-factor/compare/v5.0.0...v6.0.0)

---
updated-dependencies:
- dependency-name: devise-two-factor
  dependency-type: direct:production
  dependency-group: bundler
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.3
+          ruby-version: 3.3.4
       - name: Cache gems
         uses: actions/cache@v1
         with:
@@ -35,7 +35,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.3
+          ruby-version: 3.3.4
       - name: Cache gems
         uses: actions/cache@v1
         with:
@@ -100,13 +100,15 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.3
+          ruby-version: 3.3.4
       - name: Set up Node
         uses: actions/setup-node@v1
         with:
           node-version: 20.9.0
       - name: Install Chrome
         uses: browser-actions/setup-chrome@latest
+        with:
+          chrome-version: 125
       - name: Cache node_modules
         uses: actions/cache@v1
         with:

.rubocop.yml

@@ -11,6 +11,7 @@ AllCops:
     - bin/*
     - vendor/**/*
   TargetRubyVersion: '3.3'
+  SuggestExtensions: false
 
 Metrics/BlockLength:
   Exclude:
@@ -33,6 +34,7 @@ Metrics/MethodLength:
   Max: 30
   Exclude:
     - 'db/migrate/**'
+    - 'spec/**/*'
 
 Metrics/CyclomaticComplexity:
   Max: 15
@@ -45,6 +47,8 @@ Layout/LineLength:
 
 Metrics/AbcSize:
   Max: 45
+  Exclude:
+    - spec/**/*
 
 Metrics/ModuleLength:
   Max: 500
@@ -64,6 +68,9 @@ RSpec/ExampleLength:
 RSpec/MultipleMemoizedHelpers:
   Max: 6
 
+Metrics/BlockNesting:
+  Max: 4
+
 Rails/I18nLocaleTexts:
   Enabled: false
 
@@ -78,6 +85,3 @@ Rails/ApplicationController:
 
 Rails/Output:
   Enabled: false
-
-Capybara/ClickLinkOrButtonStyle:
-  Enabled: false

Dockerfile

@@ -1,12 +1,12 @@
-FROM ruby:3.3.3-alpine as fonts
+FROM ruby:3.3.4-alpine as fonts
 
 WORKDIR /fonts
 
-RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/v2031/DancingScript-Regular.otf && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt
+RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt
 
 RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'
 
-FROM ruby:3.3.3-alpine as webpack
+FROM ruby:3.3.4-alpine as webpack
 
 ENV RAILS_ENV=production
 ENV NODE_ENV=production
@@ -32,7 +32,7 @@ COPY ./app/views ./app/views
 
 RUN echo "gem 'shakapacker'" > Gemfile && ./bin/shakapacker
 
-FROM ruby:3.3.3-alpine as app
+FROM ruby:3.3.4-alpine as app
 
 ENV RAILS_ENV=production
 ENV BUNDLE_WITHOUT="development:test"

Gemfile

@@ -2,10 +2,11 @@
 
 source 'https://rubygems.org'
 
-ruby '3.3.3'
+ruby '3.3.4'
 
 gem 'arabic-letter-connector', require: 'arabic-letter-connector/logic'
 gem 'aws-sdk-s3', require: false
+gem 'aws-sdk-secretsmanager', require: false
 gem 'azure-storage-blob', require: false
 gem 'bootsnap', require: false
 gem 'cancancan'
@@ -22,6 +23,7 @@ gem 'image_processing'
 gem 'jwt'
 gem 'lograge'
 gem 'mysql2', require: false
+gem 'net-smtp', '0.4.0'
 gem 'oj'
 gem 'pagy'
 gem 'pg', require: false

Gemfile.lock

@@ -1,35 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.2)
+    actioncable (7.1.3.4)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.2)
+    actionmailbox (7.1.3.4)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.2)
+      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.2)
+      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.2)
+      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.2)
+    actionmailer (7.1.3.4)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.1.3.4)
-      actionview (= 7.1.3.2)
+      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.2)
+      activejob (= 7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.2)
+    actionpack (7.1.3.4)
-      actionview (= 7.1.3.2)
+      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -37,35 +37,35 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.2)
+    actiontext (7.1.3.4)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.1.3.4)
-      activerecord (= 7.1.3.2)
+      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.2)
+      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.2)
+    actionview (7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.3.2)
+    activejob (7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.2)
+    activemodel (7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
-    activerecord (7.1.3.2)
+    activerecord (7.1.3.4)
-      activemodel (= 7.1.3.2)
+      activemodel (= 7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.2)
+    activestorage (7.1.3.4)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.2)
+      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.2)
+      activerecord (= 7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       marcel (~> 1.0)
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -96,6 +96,9 @@ GEM
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
+    aws-sdk-secretsmanager (1.91.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sigv4 (~> 1.1)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-storage-blob (2.0.3)
@@ -119,7 +122,7 @@ GEM
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
-    builder (3.2.4)
+    builder (3.3.0)
     bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
@@ -139,7 +142,7 @@ GEM
     cldr-plurals-runtime-rb (1.1.0)
     cmdparse (3.0.7)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
@@ -162,7 +165,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (5.0.0)
+    devise-two-factor (6.0.0)
       activesupport (~> 7.0)
       devise (~> 4.0)
       railties (~> 7.0)
@@ -181,7 +184,7 @@ GEM
       rainbow
       rubocop
       smart_properties
-    erubi (1.12.0)
+    erubi (1.13.0)
     factory_bot (6.4.6)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
@@ -266,13 +269,13 @@ GEM
       openssl (>= 2.2.1)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -308,8 +311,8 @@ GEM
     method_source (1.1.0)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
+    mini_portile2 (2.8.7)
-    minitest (5.23.0)
+    minitest (5.25.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.4.0)
@@ -317,7 +320,7 @@ GEM
     mysql2 (0.5.6)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.10)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
@@ -326,13 +329,13 @@ GEM
       timeout
     net-smtp (0.4.0)
       net-protocol
-    nio4r (2.7.1)
+    nio4r (2.7.3)
-    nokogiri (1.16.5)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.5-aarch64-linux)
+    nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     oj (3.16.3)
       bigdecimal (>= 3.0)
@@ -341,8 +344,8 @@ GEM
     os (1.1.4)
     package_json (0.1.0)
     pagy (8.1.2)
-    parallel (1.24.0)
+    parallel (1.26.3)
-    parser (3.3.1.0)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
@@ -364,10 +367,10 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (5.0.5)
-    puma (6.4.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
-    racc (1.8.0)
+    racc (1.8.1)
-    rack (3.0.11)
+    rack (3.1.7)
     rack-proxy (0.7.7)
       rack
     rack-session (2.0.0)
@@ -377,20 +380,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.3.2)
+    rails (7.1.3.4)
-      actioncable (= 7.1.3.2)
+      actioncable (= 7.1.3.4)
-      actionmailbox (= 7.1.3.2)
+      actionmailbox (= 7.1.3.4)
-      actionmailer (= 7.1.3.2)
+      actionmailer (= 7.1.3.4)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.1.3.4)
-      actiontext (= 7.1.3.2)
+      actiontext (= 7.1.3.4)
-      actionview (= 7.1.3.2)
+      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.2)
+      activejob (= 7.1.3.4)
-      activemodel (= 7.1.3.2)
+      activemodel (= 7.1.3.4)
-      activerecord (= 7.1.3.2)
+      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.2)
+      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.2)
+      railties (= 7.1.3.4)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -405,9 +408,9 @@ GEM
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (7.1.3.2)
+    railties (7.1.3.4)
-      actionpack (= 7.1.3.2)
+      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.2)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -415,12 +418,12 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.6.3.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    redis-client (0.22.0)
+    redis-client (0.22.2)
       connection_pool
-    regexp_parser (2.9.0)
+    regexp_parser (2.9.2)
-    reline (0.5.7)
+    reline (0.5.10)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -432,7 +435,7 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.3.8)
     rotp (6.3.0)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
@@ -455,23 +458,18 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.63.3)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
+    rubocop-ast (1.32.3)
-      parser (>= 3.3.0.4)
+      parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
     rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
@@ -480,13 +478,8 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.29.1)
+    rubocop-rspec (3.0.3)
-      rubocop (~> 1.40)
+      rubocop (~> 1.61)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
@@ -502,7 +495,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    sidekiq (7.2.2)
+    sidekiq (7.2.4)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
@@ -521,10 +514,10 @@ GEM
     smart_properties (1.17.0)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strip_attributes (1.13.0)
       activemodel (>= 3.0, < 8.0)
-    thor (1.3.1)
+    thor (1.3.2)
     timeout (0.4.1)
     trailblazer-option (0.1.2)
     turbo-rails (2.0.5)
@@ -540,7 +533,7 @@ GEM
     tzinfo-data (1.2024.1)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     uniform_notifier (1.16.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -559,7 +552,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.14)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   aarch64-linux
@@ -570,6 +563,7 @@ DEPENDENCIES
   annotate
   arabic-letter-connector
   aws-sdk-s3
+  aws-sdk-secretsmanager
   azure-storage-blob
   better_html
   bootsnap
@@ -595,6 +589,7 @@ DEPENDENCIES
   letter_opener_web
   lograge
   mysql2
+  net-smtp (= 0.4.0)
   oj
   pagy
   pg
@@ -627,7 +622,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.3.3p89
+   ruby 3.3.4p94
 
 BUNDLED WITH
    2.5.3

README.md

@@ -42,7 +42,7 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 - PDF signature verification
 - Users management
 - Mobile-optimized
-- Signing available in 13 languages
+- 6 UI languages with signing available in 13 languages
 - API and Webhooks for integrations
 - Easy to deploy in minutes
 

app/controllers/account_configs_controller.rb

@@ -13,7 +13,10 @@ class AccountConfigsController < ApplicationController
     AccountConfig::FORM_WITH_CONFETTI_KEY,
     AccountConfig::DOWNLOAD_LINKS_AUTH_KEY,
     AccountConfig::FORCE_SSO_AUTH_KEY,
-    AccountConfig::FLATTEN_RESULT_PDF_KEY
+    AccountConfig::FLATTEN_RESULT_PDF_KEY,
+    AccountConfig::WITH_SIGNATURE_ID,
+    AccountConfig::COMBINE_PDF_RESULT_KEY,
+    AccountConfig::REQUIRE_SIGNING_REASON_KEY
   ].freeze
 
   InvalidKey = Class.new(StandardError)

app/controllers/accounts_controller.rb

@@ -4,10 +4,11 @@ class AccountsController < ApplicationController
   LOCALE_OPTIONS = {
     'en-US' => 'English (United States)',
     'en-GB' => 'English (United Kingdom)',
-    'fr-FR' => 'French (France)',
+    'fr-FR' => 'Français',
-    'es-ES' => 'Spanish (Spain)',
+    'es-ES' => 'Español',
-    'pt-PT' => 'Portuguese (Portugal)',
+    'pt-PT' => 'Português',
-    'de-DE' => 'German (Germany)'
+    'de-DE' => 'Deutsch',
+    'it-IT' => 'Italiano'
   }.freeze
 
   before_action :load_account
@@ -18,21 +19,25 @@ class AccountsController < ApplicationController
   def update
     current_account.update!(account_params)
 
-    @encrypted_config = EncryptedConfig.find_or_initialize_by(account: current_account,
+    unless Docuseal.multitenant?
-                                                              key: EncryptedConfig::APP_URL_KEY)
+      @encrypted_config = EncryptedConfig.find_or_initialize_by(account: current_account,
-    @encrypted_config.assign_attributes(app_url_params)
+                                                                key: EncryptedConfig::APP_URL_KEY)
+      @encrypted_config.assign_attributes(app_url_params)
 
-    unless URI.parse(@encrypted_config.value.to_s).class.in?([URI::HTTP, URI::HTTPS])
+      unless URI.parse(@encrypted_config.value.to_s).class.in?([URI::HTTP, URI::HTTPS])
-      @encrypted_config.errors.add(:value, 'should be a valid URL')
+        @encrypted_config.errors.add(:value, I18n.t('should_be_a_valid_url'))
 
-      return render :show, status: :unprocessable_entity
+        return render :show, status: :unprocessable_entity
+      end
+
+      @encrypted_config.save!
+
+      Docuseal.refresh_default_url_options!
     end
 
-    @encrypted_config.save!
+    with_locale do
-
+      redirect_to settings_account_path, notice: I18n.t('account_information_has_been_updated')
-    Docuseal.refresh_default_url_options!
+    end
-
-    redirect_to settings_account_path, notice: 'Account information has been updated'
   rescue ActiveRecord::RecordInvalid
     render :show, status: :unprocessable_entity
   end
@@ -42,11 +47,12 @@ class AccountsController < ApplicationController
 
     true_user.update!(locked_at: Time.current)
 
+    # rubocop:disable Layout/LineLength
     render turbo_stream: turbo_stream.replace(
       :account_delete_button,
-      html: helpers.tag.p('Your account removal request will be processed within 2 weeks. ' \
+      html: helpers.tag.p(I18n.t('your_account_removal_request_will_be_processed_within_2_weeks_please_contact_us_if_you_want_to_keep_your_account'))
-                          'Please contact us if you want to keep your account.')
     )
+    # rubocop:enable Layout/LineLength
   end
 
   private

app/controllers/api/api_base_controller.rb

@@ -39,12 +39,17 @@ module Api
 
     private
 
-    def paginate(relation)
+    def paginate(relation, field: :id)
-      result = relation.order(id: :desc)
+      result = relation.order(field => :desc)
                        .limit([params.fetch(:limit, DEFAULT_LIMIT).to_i, MAX_LIMIT].min)
 
-      result = result.where(id: ...params[:after].to_i) if params[:after].present?
+      if field == :id
-      result = result.where(id: (params[:before].to_i + 1)...) if params[:before].present?
+        result = result.where(id: ...params[:after].to_i) if params[:after].present?
+        result = result.where(id: (params[:before].to_i + 1)...) if params[:before].present?
+      else
+        result = result.where(field => ...params[:after]) if params[:after].present?
+        result = result.where(field => (params[:before] + 1)...) if params[:before].present?
+      end
 
       result
     end

app/controllers/api/attachments_controller.rb

@@ -16,7 +16,7 @@ module Api
         cookies.encrypted[:signature_uuids] = build_new_cookie_signatures_json(submitter, attachment)
       end
 
-      render json: attachment.as_json(only: %i[uuid], methods: %i[url filename content_type])
+      render json: attachment.as_json(only: %i[uuid created_at], methods: %i[url filename content_type])
     end
 
     def build_new_cookie_signatures_json(submitter, attachment)

app/controllers/api/form_events_controller.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Api
+  class FormEventsController < ApiBaseController
+    load_and_authorize_resource :submitter, parent: false
+
+    def index
+      submitters = @submitters.where.not(completed_at: nil)
+
+      params[:after] = Time.zone.at(params[:after].to_i) if params[:after].present?
+      params[:before] = Time.zone.at(params[:before].to_i) if params[:before].present?
+
+      submitters = paginate(
+        submitters.preload(template: :folder, submission: [:submitters, { audit_trail_attachment: :blob,
+                                                                          combined_document_attachment: :blob }],
+                           documents_attachments: :blob, attachments_attachments: :blob),
+        field: :completed_at
+      )
+
+      render json: {
+        data: submitters.map do |s|
+                {
+                  event_type: 'form.completed',
+                  timestamp: s.completed_at,
+                  data: Submitters::SerializeForWebhook.call(s)
+                }
+              end,
+        pagination: {
+          count: submitters.size,
+          next: submitters.last&.completed_at&.to_i,
+          prev: submitters.first&.completed_at&.to_i
+        }
+      }
+    end
+  end
+end

app/controllers/api/submission_events_controller.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Api
+  class SubmissionEventsController < ApiBaseController
+    load_and_authorize_resource :submission, parent: false
+
+    def index
+      submissions = build_completed_query(@submissions)
+
+      params[:after] = Time.zone.at(params[:after].to_i) if params[:after].present?
+      params[:before] = Time.zone.at(params[:before].to_i) if params[:before].present?
+
+      submissions = paginate(submissions.preload(
+                               :created_by_user, :submission_events,
+                               template: :folder,
+                               submitters: { documents_attachments: :blob, attachments_attachments: :blob },
+                               audit_trail_attachment: :blob
+                             ),
+                             field: :completed_at)
+
+      render json: {
+        data: submissions.map do |s|
+                {
+                  event_type: 'submission.completed',
+                  timestamp: s.completed_at,
+                  data: Submissions::SerializeForApi.call(s, s.submitters)
+                }
+              end,
+        pagination: {
+          count: submissions.size,
+          next: submissions.last&.completed_at&.to_i,
+          prev: submissions.first&.completed_at&.to_i
+        }
+      }
+    end
+
+    private
+
+    def build_completed_query(submissions)
+      submissions = submissions.where(
+        Submitter.where(completed_at: nil).where(
+          Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id])
+        ).select(1).arel.exists.not
+      )
+
+      submissions.joins(:submitters)
+                 .group(:id)
+                 .select(Submission.arel_table[Arel.star],
+                         Submitter.arel_table[:completed_at].maximum.as('completed_at'))
+    end
+  end
+end

app/controllers/api/submissions_controller.rb

@@ -19,10 +19,14 @@ module Api
 
       submissions = paginate(submissions.preload(:created_by_user, :submitters,
                                                  template: :folder,
+                                                 combined_document_attachment: :blob,
                                                  audit_trail_attachment: :blob))
 
       render json: {
-        data: submissions.as_json(Submissions::SerializeForApi::SERIALIZE_PARAMS),
+        data: submissions.map do |s|
+          Submissions::SerializeForApi.call(s, s.submitters, params,
+                                            with_events: false, with_documents: false, with_values: false)
+        end,
         pagination: {
           count: submissions.size,
           next: submissions.last&.id,
@@ -75,14 +79,8 @@ module Api
         end
       end
 
-      json = submissions.flat_map do |submission|
+      render json: build_create_json(submissions)
-        submission.submitters.map do |s|
+    rescue Submitters::NormalizeValues::BaseError, DownloadUtils::UnableToDownload => e
-          Submitters::SerializeForApi.call(s, with_documents: false, with_urls: true)
-        end
-      end
-
-      render json:
-    rescue Submitters::NormalizeValues::BaseError => e
       Rollbar.warning(e) if defined?(Rollbar)
 
       render json: { error: e.message }, status: :unprocessable_entity
@@ -102,6 +100,18 @@ module Api
 
     private
 
+    def build_create_json(submissions)
+      json = submissions.flat_map do |submission|
+        submission.submitters.map do |s|
+          Submitters::SerializeForApi.call(s, with_documents: false, with_urls: true, params:)
+        end
+      end
+
+      json = { submitters: json } if request.path.ends_with?('/init')
+
+      json
+    end
+
     def create_submissions(template, params)
       is_send_email = !params[:send_email].in?(['false', false])
 
@@ -121,7 +131,6 @@ module Api
           template:,
           user: current_user,
           source: :api,
-          mark_as_sent: is_send_email,
           submitters_order: params[:submitters_order] || params[:order] || 'preserved',
           submissions_attrs:,
           params:
@@ -142,13 +151,14 @@ module Api
     def submissions_params
       permitted_attrs = [
         :send_email, :send_sms, :bcc_completed, :completed_redirect_url, :reply_to, :go_to_last,
+        :expire_at,
         {
           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,
                         { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
                           fields: [:name, :uuid, :default_value, :value, :title, :description,
-                                   :readonly, :redacted, :validation_pattern, :invalid_message,
+                                   :readonly, :validation_pattern, :invalid_message,
                                    { default_value: [], value: [], preferences: {} }] }]]
         }
       ]

app/controllers/api/submitters_controller.rb

@@ -23,7 +23,9 @@ module Api
       )
 
       render json: {
-        data: submitters.map { |s| Submitters::SerializeForApi.call(s, with_template: true, with_events: true) },
+        data: submitters.map do |s|
+                Submitters::SerializeForApi.call(s, with_template: true, with_events: true, params:)
+              end,
         pagination: {
           count: submitters.size,
           next: submitters.last&.id,
@@ -35,7 +37,7 @@ module Api
     def show
       Submissions::EnsureResultGenerated.call(@submitter) if @submitter.completed_at?
 
-      render json: Submitters::SerializeForApi.call(@submitter, with_template: true, with_events: true)
+      render json: Submitters::SerializeForApi.call(@submitter, with_template: true, with_events: true, params:)
     end
 
     def update
@@ -73,7 +75,12 @@ module Api
 
       render json: Submitters::SerializeForApi.call(@submitter, with_template: false,
                                                                 with_urls: true,
-                                                                with_events: false)
+                                                                with_events: false,
+                                                                params:)
+    rescue Submitters::NormalizeValues::BaseError, DownloadUtils::UnableToDownload => e
+      Rollbar.warning(e) if defined?(Rollbar)
+
+      render json: { error: e.message }, status: :unprocessable_entity
     end
 
     def submitter_params
@@ -84,7 +91,7 @@ module Api
         :completed, :phone, :application_key, :external_id, :go_to_last,
         { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
           fields: [[:name, :uuid, :default_value, :value,
-                    :readonly, :redacted, :validation_pattern, :invalid_message,
+                    :readonly, :validation_pattern, :invalid_message,
                     { default_value: [], value: [], preferences: {} }]] }
       )
     end

app/controllers/api/templates_clone_controller.rb

@@ -7,6 +7,11 @@ module Api
     def create
       authorize!(:manage, @template)
 
+      ActiveRecord::Associations::Preloader.new(
+        records: [@template],
+        associations: [schema_documents: :preview_images_attachments]
+      ).call
+
       cloned_template = Templates::Clone.call(
         @template,
         author: current_user,
@@ -18,11 +23,11 @@ module Api
       cloned_template.source = :api
       cloned_template.save!
 
-      Templates::CloneAttachments.call(template: cloned_template, original_template: @template)
+      schema_documents = Templates::CloneAttachments.call(template: cloned_template, original_template: @template)
 
       SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => cloned_template.id)
 
-      render json: Templates::SerializeForApi.call(cloned_template)
+      render json: Templates::SerializeForApi.call(cloned_template, schema_documents)
     end
   end
 end

app/controllers/api/templates_controller.rb

@@ -18,7 +18,7 @@ module Api
 
       preview_image_attachments =
         ActiveStorage::Attachment.joins(:blob)
-                                 .where(blob: { filename: '0.jpg' })
+                                 .where(blob: { filename: ['0.png', '0.jpg'] })
                                  .where(record_id: schema_documents.map(&:id),
                                         record_type: 'ActiveStorage::Attachment',
                                         name: :preview_images)
@@ -95,8 +95,9 @@ module Api
     def template_params
       permitted_params = [
         :name,
+        :external_id,
         {
-          submitters: [%i[name uuid]],
+          submitters: [%i[name uuid is_requester invite_by_uuid linked_to_uuid email]],
           fields: [[:uuid, :submitter_uuid, :name, :type,
                     :required, :readonly, :default_value,
                     :title, :description,

app/controllers/api/tools_controller.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Api
+  class ToolsController < ApiBaseController
+    skip_authorization_check
+
+    def merge
+      files = params[:files] || []
+
+      return render json: { error: 'Files are required' }, status: :unprocessable_entity if files.blank?
+      return render json: { error: 'At least 2 files are required' }, status: :unprocessable_entity if files.size < 2
+
+      render json: {
+        data: Base64.encode64(PdfUtils.merge(files.map { |base64| StringIO.new(Base64.decode64(base64)) }).string)
+      }
+    end
+
+    def verify
+      file = Base64.decode64(params[:file])
+      pdf = HexaPDF::Document.new(io: StringIO.new(file))
+
+      trusted_certs = Accounts.load_trusted_certs(current_account)
+
+      is_checksum_found = ActiveStorage::Attachment.joins(:blob)
+                                                   .where(name: 'documents', record_type: 'Submitter')
+                                                   .exists?(blob: { checksum: Digest::MD5.base64digest(file) })
+
+      render json: {
+        checksum_status: is_checksum_found ? 'verified' : 'not_found',
+        signatures: pdf.signatures.map do |sig|
+          {
+            verification_result: sig.verify(trusted_certs:).messages,
+            signer_name: sig.signer_name,
+            signing_reason: sig.signing_reason,
+            signing_time: sig.signing_time,
+            signature_type: sig.signature_type
+          }
+        end
+      }
+    end
+  end
+end

app/controllers/api/users_controller.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Api
+  class UsersController < ApiBaseController
+    authorize_resource :current_user
+
+    def show
+      render json: current_user.as_json(only: %i[id first_name last_name email])
+    end
+  end
+end

app/controllers/api_settings_controller.rb

@@ -12,6 +12,6 @@ class ApiSettingsController < ApplicationController
 
     current_user.access_token.save!
 
-    redirect_back(fallback_location: settings_api_index_path, notice: 'API token as been updated.')
+    redirect_back(fallback_location: settings_api_index_path, notice: I18n.t('api_token_has_been_updated'))
   end
 end

app/controllers/application_controller.rb

@@ -8,6 +8,7 @@ class ApplicationController < ActionController::Base
 
   check_authorization unless: :devise_controller?
 
+  around_action :with_locale
   before_action :sign_in_for_demo, if: -> { Docuseal.demo? }
   before_action :maybe_redirect_to_setup, unless: :signed_in?
   before_action :authenticate_user!, unless: :devise_controller?
@@ -51,7 +52,18 @@ class ApplicationController < ActionController::Base
 
   private
 
+  def with_locale(&)
+    return yield unless current_account
+
+    locale   = params[:lang].presence if Rails.env.development?
+    locale ||= current_account.locale
+
+    I18n.with_locale(locale, &)
+  end
+
   def with_browser_locale(&)
+    return yield if I18n.locale != :'en-US'
+
     locale   = params[:lang].presence
     locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].to_s[BROWSER_LOCALE_REGEXP].to_s
 
@@ -79,7 +91,8 @@ class ApplicationController < ActionController::Base
     redirect_to setup_index_path unless User.exists?
   end
 
-  def button_title(title: 'Submit', disabled_with: 'Submitting', title_class: '', icon: nil, icon_disabled: nil)
+  def button_title(title: I18n.t('submit'), disabled_with: I18n.t('submitting'), title_class: '', icon: nil,
+                   icon_disabled: nil)
     render_to_string(partial: 'shared/button_title',
                      locals: { title:, disabled_with:, title_class:, icon:, icon_disabled: })
   end

app/controllers/dashboard_controller.rb

@@ -33,7 +33,7 @@ class DashboardController < ApplicationController
                                                                              account_id: current_user.account_id,
                                                                              key: AccountConfig::FORCE_MFA)
 
-    redirect_to mfa_setup_path, notice: 'Setup 2FA to continue'
+    redirect_to mfa_setup_path, notice: I18n.t('setup_2fa_to_continue')
   end
 
   def maybe_render_landing

app/controllers/email_smtp_settings_controller.rb

@@ -11,7 +11,7 @@ class EmailSmtpSettingsController < ApplicationController
     if @encrypted_config.update(email_configs)
       SettingsMailer.smtp_successful_setup(@encrypted_config.value['from_email']).deliver_now!
 
-      redirect_to settings_email_index_path, notice: 'Changes have been saved'
+      redirect_to settings_email_index_path, notice: I18n.t('changes_have_been_saved')
     else
       render :index, status: :unprocessable_entity
     end

app/controllers/embed_scripts_controller.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class EmbedScriptsController < ActionController::Metal
+  DUMMY_SCRIPT = <<~JAVASCRIPT.freeze
+    const DummyBuilder = class extends HTMLElement {
+      connectedCallback() {
+        this.innerHTML = `
+          <div style="text-align: center; padding: 20px; font-family: Arial, sans-serif;">
+            <h2>Upgrade to Pro</h2>
+            <p>Unlock embedded components by upgrading to Pro</p>
+            <div style="margin-top: 40px;">
+              <a href="#{Docuseal::CONSOLE_URL}/on_premise" target="_blank" style="padding: 15px 25px; background-color: #222; color: white; text-decoration: none; border-radius: 5px; font-size: 16px; cursor: pointer;">
+                Learn More
+              </a>
+            </div>
+          </div>
+        `;
+      }
+    };
+
+    const DummyForm = class extends DummyBuilder {};
+
+    if (!window.customElements.get('docuseal-builder')) {
+      window.customElements.define('docuseal-builder', DummyBuilder);
+    }
+
+    if (!window.customElements.get('docuseal-form')) {
+      window.customElements.define('docuseal-form', DummyForm);
+    }
+  JAVASCRIPT
+
+  def show
+    headers['Content-Type'] = 'application/javascript'
+
+    self.response_body = DUMMY_SCRIPT
+
+    self.status = 200
+  end
+end

app/controllers/esign_settings_controller.rb

@@ -21,9 +21,9 @@ class EsignSettingsController < ApplicationController
     default_pkcs = GenerateCertificate.load_pkcs(cert_data) if cert_data['cert'].present?
 
     custom_pkcs_list = (cert_data['custom'] || []).map do |e|
-      { 'pkcs' => OpenSSL::PKCS12.new(Base64.urlsafe_decode64(e['data']), e['password'].to_s),
+      pkcs = e['data'].present? ? OpenSSL::PKCS12.new(Base64.urlsafe_decode64(e['data']), e['password'].to_s) : nil
-        'name' => e['name'],
+
-        'status' => e['status'] }
+      { 'pkcs' => pkcs, 'name' => e['name'], 'status' => e['status'] }
     end
 
     @pkcs_list = [
@@ -48,7 +48,7 @@ class EsignSettingsController < ApplicationController
     if (@encrypted_config.value && @encrypted_config.value['custom']&.any? { |e| e['name'] == @cert_record.name }) ||
        @cert_record.name == DEFAULT_CERT_NAME
 
-      @cert_record.errors.add(:name, 'already exists')
+      @cert_record.errors.add(:name, I18n.t('already_exists'))
 
       return render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'),
                     status: :unprocessable_entity
@@ -56,7 +56,7 @@ class EsignSettingsController < ApplicationController
 
     save_new_cert!(@encrypted_config, @cert_record)
 
-    redirect_to settings_esign_path, notice: 'Certificate has been successfully added!'
+    redirect_to settings_esign_path, notice: I18n.t('certificate_has_been_successfully_added')
   rescue OpenSSL::PKCS12::PKCS12Error => e
     Rollbar.error(e) if defined?(Rollbar)
 
@@ -66,14 +66,20 @@ class EsignSettingsController < ApplicationController
   end
 
   def update
-    @encrypted_config.value['custom'].each { |e| e['status'] = 'validate' }
+    @encrypted_config.value['custom'].to_a.each { |e| e['status'] = 'validate' }
 
-    custom_cert_data = @encrypted_config.value['custom'].find { |e| e['name'] == params[:name] }
+    custom_cert_data = @encrypted_config.value['custom'].to_a.find { |e| e['name'] == params[:name] }
-    custom_cert_data['status'] = 'default' if custom_cert_data
+
+    if custom_cert_data
+      custom_cert_data['status'] = 'default'
+    elsif params[:name] == Docuseal::AATL_CERT_NAME
+      @encrypted_config.value['custom'] ||= []
+      @encrypted_config.value['custom'] << { 'name' => params[:name], 'status' => 'default' }
+    end
 
     @encrypted_config.save!
 
-    redirect_to settings_esign_path, notice: 'Default certificate has been selected'
+    redirect_to settings_esign_path, notice: I18n.t('default_certificate_has_been_selected')
   end
 
   def destroy
@@ -81,7 +87,7 @@ class EsignSettingsController < ApplicationController
 
     @encrypted_config.save!
 
-    redirect_to settings_esign_path, notice: 'Certificate has been removed'
+    redirect_to settings_esign_path, notice: I18m.t('certificate_has_been_removed')
   end
 
   private

app/controllers/mfa_setup_controller.rb

@@ -18,11 +18,11 @@ class MfaSetupController < ApplicationController
       current_user.otp_required_for_login = true
       current_user.save!
 
-      redirect_to settings_profile_index_path, notice: '2FA has been configured'
+      redirect_to settings_profile_index_path, notice: I18n.t('2fa_has_been_configured')
     else
       @provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Docuseal.product_name)
 
-      @error_message = 'Code is invalid'
+      @error_message = I18n.t('code_is_invalid')
 
       render turbo_stream: turbo_stream.replace(:mfa_form, partial: 'mfa_setup/form'), status: :unprocessable_entity
     end
@@ -32,9 +32,9 @@ class MfaSetupController < ApplicationController
     if current_user.validate_and_consume_otp!(params[:otp_attempt])
       current_user.update!(otp_required_for_login: false, otp_secret: nil)
 
-      redirect_to settings_profile_index_path, notice: '2FA has been removed'
+      redirect_to settings_profile_index_path, notice: I18n.t('2fa_has_been_removed')
     else
-      @error_message = 'Code is invalid'
+      @error_message = I18n.t('code_is_invalid')
 
       render turbo_stream: turbo_stream.replace(:modal, template: 'mfa_setup/edit'), status: :unprocessable_entity
     end
@@ -43,7 +43,7 @@ class MfaSetupController < ApplicationController
   private
 
   def set_provision_url
-    return redirect_to root_path, alert: '2FA has been set up already' if current_user.otp_required_for_login
+    return redirect_to root_path, alert: I18n.t('2fa_has_been_set_up_already') if current_user.otp_required_for_login
 
     current_user.otp_secret ||= User.generate_otp_secret
 

app/controllers/notifications_settings_controller.rb

@@ -13,9 +13,9 @@ class NotificationsSettingsController < ApplicationController
 
   def create
     if @account_config.value.present? ? @account_config.save : @account_config.delete
-      redirect_back fallback_location: settings_notifications_path, notice: 'Changes have been saved'
+      redirect_back fallback_location: settings_notifications_path, notice: I18n.t('changes_have_been_saved')
     else
-      redirect_back fallback_location: settings_notifications_path, alert: 'Unable to save'
+      redirect_back fallback_location: settings_notifications_path, alert: I18n.t('unable_to_save')
     end
   end
 

app/controllers/personalization_settings_controller.rb

@@ -30,7 +30,7 @@ class PersonalizationSettingsController < ApplicationController
       @account_config.save!
     end
 
-    redirect_back(fallback_location: settings_personalization_path, notice: 'Settings have been saved.')
+    redirect_back(fallback_location: settings_personalization_path, notice: I18n.t('settings_have_been_saved'))
   end
 
   private

app/controllers/profile_controller.rb

@@ -9,7 +9,7 @@ class ProfileController < ApplicationController
 
   def update_contact
     if current_user.update(contact_params)
-      redirect_to settings_profile_index_path, notice: 'Contact information has been updated'
+      redirect_to settings_profile_index_path, notice: I18n.t('contact_information_has_been_update')
     else
       render :index, status: :unprocessable_entity
     end
@@ -18,7 +18,7 @@ class ProfileController < ApplicationController
   def update_password
     if current_user.update(password_params)
       bypass_sign_in(current_user)
-      redirect_to settings_profile_index_path, notice: 'Password has been changed'
+      redirect_to settings_profile_index_path, notice: I18n.t('password_has_been_changed')
     else
       render :index, status: :unprocessable_entity
     end

app/controllers/send_submission_email_controller.rb

@@ -7,6 +7,8 @@ class SendSubmissionEmailController < ApplicationController
   skip_before_action :verify_authenticity_token
   skip_authorization_check
 
+  SEND_DURATION = 30.minutes
+
   def success; end
 
   def create
@@ -23,7 +25,10 @@ class SendSubmissionEmailController < ApplicationController
 
     RateLimit.call("send-email-#{@submitter.id}", limit: 2, ttl: 5.minutes)
 
-    SubmitterMailer.documents_copy_email(@submitter, sig: true).deliver_later!
+    unless EmailEvent.exists?(tag: :submitter_documents_copy, email: @submitter.email, emailable: @submitter,
+                              event_type: :send, created_at: SEND_DURATION.ago..Time.current)
+      SubmitterMailer.documents_copy_email(@submitter, sig: true).deliver_later!
+    end
 
     respond_to do |f|
       f.html { redirect_to success_send_submission_email_index_path }

app/controllers/sessions_controller.rb

@@ -12,7 +12,7 @@ class SessionsController < Devise::SessionsController
       Rollbar.warning('Sign in new user') if defined?(Rollbar)
 
       return redirect_to new_registration_path(sign_up: true, user: sign_in_params.slice(:email)),
-                         notice: 'Create a new account'
+                         notice: I18n.t('create_a_new_account')
     end
 
     if User.exists?(email:, otp_required_for_login: true) && sign_in_params[:otp_attempt].blank?

app/controllers/setup_controller.rb

@@ -21,7 +21,7 @@ class SetupController < ApplicationController
     @encrypted_config = EncryptedConfig.new(encrypted_config_params)
 
     unless URI.parse(encrypted_config_params[:value].to_s).class.in?([URI::HTTP, URI::HTTPS])
-      @encrypted_config.errors.add(:value, 'should be a valid URL')
+      @encrypted_config.errors.add(:value, I18n.t('should_be_a_valid_url'))
 
       return render :index, status: :unprocessable_entity
     end
@@ -56,7 +56,7 @@ class SetupController < ApplicationController
   def account_params
     return {} unless params[:account]
 
-    params.require(:account).permit(:name, :timezone)
+    params.require(:account).permit(:name, :timezone, :locale)
   end
 
   def encrypted_config_params
@@ -66,10 +66,10 @@ class SetupController < ApplicationController
   end
 
   def redirect_to_root_if_signed
-    redirect_to root_path, notice: 'You are already signed in'
+    redirect_to root_path, notice: I18n.t('you_are_already_signed_in')
   end
 
   def ensure_first_user_not_created!
-    redirect_to new_user_session_path, notice: 'Please sign in.' if User.exists?
+    redirect_to new_user_session_path, notice: I18n.t('please_sign_in') if User.exists?
   end
 end

app/controllers/start_form_controller.rb

@@ -11,29 +11,29 @@ class StartFormController < ApplicationController
 
   def show
     @submitter = @template.submissions.new(account_id: @template.account_id)
-                          .submitters.new(uuid: @template.submitters.first['uuid'])
+                          .submitters.new(uuid: (filter_undefined_submitters(@template).first ||
+                                                 @template.submitters.first)['uuid'])
   end
 
   def update
     return redirect_to start_form_path(@template.slug) if @template.archived_at?
 
-    @submitter = Submitter.where(submission: @template.submissions.where(archived_at: nil))
+    @submitter = find_or_initialize_submitter(@template, submitter_params)
-                          .order(id: :desc)
-                          .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
-                          .find_or_initialize_by(**submitter_params.compact_blank)
 
     if @submitter.completed_at?
       redirect_to start_form_completed_path(@template.slug, email: submitter_params[:email])
     else
-      if @template.submitters.to_a.size > 1 && @submitter.new_record?
+      if filter_undefined_submitters(@template).size > 1 && @submitter.new_record?
-        @error_message = 'Not found'
+        @error_message = I18n.t('not_found')
 
         return render :show
       end
 
-      assign_submission_attributes(@submitter, @template) if @submitter.new_record?
+      if (is_new_record = @submitter.new_record?)
+        assign_submission_attributes(@submitter, @template)
 
-      is_new_record = @submitter.new_record?
+        Submissions::AssignDefinedSubmitters.call(@submitter.submission)
+      end
 
       if @submitter.save
         if is_new_record
@@ -55,14 +55,21 @@ class StartFormController < ApplicationController
 
   private
 
+  def find_or_initialize_submitter(template, submitter_params)
+    Submitter.where(submission: template.submissions.where(expire_at: Time.current..)
+                                        .or(template.submissions.where(expire_at: nil)).where(archived_at: nil))
+             .order(id: :desc)
+             .where(declined_at: nil)
+             .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
+             .find_or_initialize_by(**submitter_params.compact_blank)
+  end
+
   def assign_submission_attributes(submitter, template)
     resubmit_submitter =
-      if params[:resubmit].present?
+      (Submitter.where(submission: template.submissions).find_by(slug: params[:resubmit]) if params[:resubmit].present?)
-        Submitter.where(submission: @template.submissions).find_by(slug: params[:resubmit])
-      end
 
     submitter.assign_attributes(
-      uuid: template.submitters.first['uuid'],
+      uuid: (filter_undefined_submitters(template).first || @template.submitters.first)['uuid'],
       ip: request.remote_ip,
       ua: request.user_agent,
       values: resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
@@ -79,11 +86,18 @@ class StartFormController < ApplicationController
     submitter.submission ||= Submission.new(template:,
                                             account_id: template.account_id,
                                             template_submitters: template.submitters,
+                                            submitters: [submitter],
                                             source: :link)
 
+    submitter.account_id = submitter.submission.account_id
+
     submitter
   end
 
+  def filter_undefined_submitters(template)
+    Templates.filter_undefined_submitters(template)
+  end
+
   def submitter_params
     params.require(:submitter).permit(:email, :phone, :name).tap do |attrs|
       attrs[:email] = Submissions.normalize_email(attrs[:email])

app/controllers/storage_settings_controller.rb

@@ -11,7 +11,7 @@ class StorageSettingsController < ApplicationController
     if @encrypted_config.update(storage_configs)
       LoadActiveStorageConfigs.reload
 
-      redirect_to settings_storage_index_path, notice: 'Changes have been saved'
+      redirect_to settings_storage_index_path, notice: I18n.t('changes_have_been_saved')
     else
       render :index, status: :unprocessable_entity
     end

app/controllers/submissions_controller.rb

@@ -39,7 +39,6 @@ class SubmissionsController < ApplicationController
                                            user: current_user,
                                            source: :invite,
                                            submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random',
-                                           mark_as_sent: params[:send_email] == '1',
                                            submissions_attrs: submissions_params[:submission].to_h.values,
                                            params: params.merge('send_completed_email' => true))
       end
@@ -50,15 +49,24 @@ class SubmissionsController < ApplicationController
 
     Submissions.send_signature_requests(submissions)
 
-    redirect_to template_path(@template), notice: 'New recipients have been added'
+    redirect_to template_path(@template), notice: I18n.t('new_recipients_have_been_added')
   end
 
   def destroy
-    @submission.update!(archived_at: Time.current)
+    notice =
+      if params[:permanently].present?
+        @submission.destroy!
 
-    SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)
+        I18n.t('submission_has_been_removed')
+      else
+        @submission.update!(archived_at: Time.current)
 
-    redirect_back(fallback_location: template_path(@submission.template), notice: 'Submission has been archived')
+        SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)
+
+        I18n.t('submission_has_been_archived')
+      end
+
+    redirect_back(fallback_location: template_path(@submission.template), notice:)
   end
 
   private

app/controllers/submissions_download_controller.rb

@@ -33,7 +33,7 @@ class SubmissionsDownloadController < ApplicationController
       return head :not_found
     end
 
-    if params[:combined]
+    if params[:combined] == 'true'
       url = build_combined_url(submitter)
 
       if url

app/controllers/submissions_preview_controller.rb

@@ -19,7 +19,7 @@ class SubmissionsPreviewController < ApplicationController
     @submission ||= Submission.find_by!(slug: params[:slug])
 
     if !@submission.submitters.all?(&:completed_at?) && current_user.blank?
-      raise ActionController::RoutingError, 'Not Found'
+      raise ActionController::RoutingError, I18n.t('not_found')
     end
 
     if !submission_valid_ttl?(@submission) && !signature_valid

app/controllers/submit_form_controller.rb

@@ -8,39 +8,39 @@ class SubmitFormController < ApplicationController
   skip_authorization_check
 
   CONFIG_KEYS = [].freeze
-  PRELOAD_ALL_PAGES_AMOUNT = 200
 
   def show
     @submitter = Submitter.find_by!(slug: params[:slug])
 
+    submission = @submitter.submission
+
     return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
-    return render :archived if @submitter.submission.template.archived_at? || @submitter.submission.archived_at?
+    return render :archived if submission.template.archived_at? || submission.archived_at?
+    return render :expired if submission.expired?
+    return render :declined if @submitter.declined_at?
+    return render :awaiting if submission.template.preferences['submitters_order'] == 'preserved' &&
+                               !Submitters.current_submitter_order?(@submitter)
 
-    ActiveRecord::Associations::Preloader.new(
+    Submitters.preload_with_pages(@submitter)
-      records: [@submitter],
-      associations: [submission: [:template, { template_schema_documents: :blob }]]
-    ).call
-
-    total_pages =
-      @submitter.submission.template_schema_documents.sum { |e| e.metadata.dig('pdf', 'number_of_pages').to_i }
-
-    if total_pages < PRELOAD_ALL_PAGES_AMOUNT
-      ActiveRecord::Associations::Preloader.new(
-        records: @submitter.submission.template_schema_documents,
-        associations: [:blob, { preview_images_attachments: :blob }]
-      ).call
-    end
 
     Submitters::MaybeUpdateDefaultValues.call(@submitter, current_user)
 
-    @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
+    @attachments_index = ActiveStorage::Attachment.where(record: submission.submitters, name: :attachments)
                                                   .preload(:blob).index_by(&:uuid)
 
     @form_configs = Submitters::FormConfigs.call(@submitter, CONFIG_KEYS)
 
     return unless @form_configs[:prefill_signature]
 
-    @signature_attachment =
+    if (user_signature = UserConfigs.load_signature(current_user))
+      @signature_attachment = ActiveStorage::Attachment.find_or_create_by!(
+        blob_id: user_signature.blob_id,
+        name: 'attachments',
+        record: @submitter
+      )
+    end
+
+    @signature_attachment ||=
       Submitters::MaybeAssignDefaultBrowserSignature.call(@submitter, params, cookies, @attachments_index.values)
 
     @attachments_index[@signature_attachment.uuid] = @signature_attachment if @signature_attachment
@@ -50,13 +50,20 @@ class SubmitFormController < ApplicationController
     submitter = Submitter.find_by!(slug: params[:slug])
 
     if submitter.completed_at?
-      return render json: { error: 'Form has been completed already.' }, status: :unprocessable_entity
+      return render json: { error: I18n.t('form_has_been_completed_already') }, status: :unprocessable_entity
     end
 
     if submitter.template.archived_at? || submitter.submission.archived_at?
-      Rollbar.info("Archived template: #{submitter.template.id}") if defined?(Rollbar)
+      return render json: { error: I18n.t('form_has_been_archived') }, status: :unprocessable_entity
+    end
 
-      return render json: { error: 'Form has been archived.' }, status: :unprocessable_entity
+    if submitter.submission.expired?
+      return render json: { error: I18n.t('form_has_been_expired') }, status: :unprocessable_entity
+    end
+
+    if submitter.declined_at?
+      return render json: { error: I18n.t('form_has_been_declined') },
+                    status: :unprocessable_entity
     end
 
     Submitters::SubmitValues.call(submitter, params, request)

app/controllers/submit_form_decline_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class SubmitFormDeclineController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def create
+    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+
+    return redirect_to submit_form_path(submitter.slug) if submitter.declined_at? ||
+                                                           submitter.completed_at? ||
+                                                           submitter.submission.archived_at? ||
+                                                           submitter.submission.expired? ||
+                                                           submitter.submission.template.archived_at?
+
+    ApplicationRecord.transaction do
+      submitter.update!(declined_at: Time.current)
+
+      SubmissionEvents.create_with_tracking_data(submitter, 'decline_form', request, { reason: params[:reason] })
+    end
+
+    user = submitter.submission.created_by_user || submitter.template.author
+
+    SubmitterMailer.declined_email(submitter, user).deliver_later!
+    SendFormDeclinedWebhookRequestJob.perform_async('submitter_id' => submitter.id)
+
+    redirect_to submit_form_path(submitter.slug)
+  end
+end

app/controllers/submit_form_download_controller.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class SubmitFormDownloadController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  FILES_TTL = 5.minutes
+
+  def index
+    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+
+    return redirect_to submitter_download_index_path(submitter.slug) if submitter.completed_at?
+
+    return head :unprocessable_entity if submitter.declined_at? ||
+                                         submitter.submission.archived_at? ||
+                                         submitter.submission.expired? ||
+                                         submitter.submission.template.archived_at?
+
+    last_completed_submitter = submitter.submission.submitters
+                                        .where.not(id: submitter.id)
+                                        .where.not(completed_at: nil)
+                                        .max_by(&:completed_at)
+
+    attachments =
+      if last_completed_submitter
+        Submitters.select_attachments_for_download(last_completed_submitter)
+      else
+        submitter.submission.template.schema_documents.preload(:blob)
+      end
+
+    urls = attachments.map do |attachment|
+      ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
+    end
+
+    render json: urls
+  end
+end

app/controllers/submit_form_invite_controller.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class SubmitFormInviteController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def create
+    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+
+    return head :unprocessable_entity unless can_invite?(submitter)
+
+    invite_submitters = filter_invite_submitters(submitter)
+
+    ApplicationRecord.transaction do
+      invite_submitters.each do |item|
+        attrs = submitters_attributes.find { |e| e[:uuid] == item['uuid'] }
+
+        next unless attrs
+
+        submitter.submission.submitters.create!(**attrs, account_id: submitter.account_id)
+
+        SubmissionEvents.create_with_tracking_data(submitter, 'invite_party', request, { uuid: submitter.uuid })
+      end
+
+      submitter.submission.update!(submitters_order: :preserved)
+    end
+
+    submitter.submission.submitters.reload
+
+    if invite_submitters.all? { |s| submitter.submission.submitters.any? { |e| e.uuid == s['uuid'] } }
+      Submitters::SubmitValues.call(submitter, ActionController::Parameters.new(completed: 'true'), request)
+
+      head :ok
+    else
+      head :unprocessable_entity
+    end
+  end
+
+  private
+
+  def can_invite?(submitter)
+    !submitter.declined_at? &&
+      !submitter.completed_at? &&
+      !submitter.submission.archived_at? &&
+      !submitter.submission.expired? &&
+      !submitter.submission.template.archived_at?
+  end
+
+  def filter_invite_submitters(submitter)
+    (submitter.submission.template_submitters || submitter.submission.template.submitters).select do |s|
+      s['invite_by_uuid'] == submitter.uuid && submitter.submission.submitters.none? { |e| e.uuid == s['uuid'] }
+    end
+  end
+
+  def submitters_attributes
+    params.require(:submission).permit(submitters: [%i[uuid email]]).fetch(:submitters, [])
+  end
+end

app/controllers/submit_form_values_controller.rb

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

app/controllers/submitters_send_email_controller.rb

@@ -10,7 +10,7 @@ class SubmittersSendEmailController < ApplicationController
       Rollbar.warning("Already sent: #{@submitter.id}") if defined?(Rollbar)
 
       return redirect_back(fallback_location: submission_path(@submitter.submission),
-                           alert: 'Email has been sent already.')
+                           alert: I18n.t('email_has_been_sent_already'))
     end
 
     SendSubmitterInvitationEmailJob.perform_async('submitter_id' => @submitter.id)
@@ -18,6 +18,6 @@ class SubmittersSendEmailController < ApplicationController
     @submitter.sent_at ||= Time.current
     @submitter.save!
 
-    redirect_back(fallback_location: submission_path(@submitter.submission), notice: 'Email has been sent')
+    redirect_back(fallback_location: submission_path(@submitter.submission), notice: I18n.t('email_has_been_sent'))
   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: 'File is missing' }, status: :unprocessable_entity
+      return render json: { error: I18n.t('file_is_missing') }, status: :unprocessable_entity
     end
 
     old_fields_hash = @template.fields.hash
@@ -28,6 +28,6 @@ class TemplateDocumentsController < ApplicationController
       )
     }
   rescue Templates::CreateAttachments::PdfEncrypted
-    render json: { error: 'PDF encrypted' }, status: :unprocessable_entity
+    render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_entity
   end
 end

app/controllers/template_folders_controller.rb

@@ -15,9 +15,9 @@ class TemplateFoldersController < ApplicationController
   def update
     if @template_folder != current_account.default_template_folder &&
        @template_folder.update(template_folder_params)
-      redirect_to folder_path(@template_folder), notice: 'Folder name has been updated'
+      redirect_to folder_path(@template_folder), notice: I18n.t('folder_name_has_been_updated')
     else
-      redirect_to folder_path(@template_folder), alert: 'Unable to rename folder'
+      redirect_to folder_path(@template_folder), alert: I18n.t('unable_to_rename_folder')
     end
   end
 

app/controllers/templates_controller.rb

@@ -21,13 +21,13 @@ class TemplatesController < ApplicationController
   end
 
   def new
-    @template.name = "#{@base_template.name} (Clone)" if @base_template
+    @template.name = "#{@base_template.name} (#{I18n.t('clone')})" if @base_template
   end
 
   def edit
     ActiveRecord::Associations::Preloader.new(
       records: [@template],
-      associations: [schema_documents: { preview_images_attachments: :blob }]
+      associations: [schema_documents: [:blob, { preview_images_attachments: :blob }]]
     ).call
 
     @template_data =
@@ -43,6 +43,11 @@ class TemplatesController < ApplicationController
 
   def create
     if @base_template
+      ActiveRecord::Associations::Preloader.new(
+        records: [@base_template],
+        associations: [schema_documents: :preview_images_attachments]
+      ).call
+
       @template = Templates::Clone.call(@base_template, author: current_user,
                                                         name: params.dig(:template, :name),
                                                         folder_name: params[:folder_name])
@@ -82,13 +87,11 @@ class TemplatesController < ApplicationController
       if params[:permanently].present?
         @template.destroy!
 
-        Rollbar.info("Remove template: #{@template.id}") if defined?(Rollbar)
+        I18n.t('template_has_been_removed')
-
-        'Template has been removed.'
       else
         @template.update!(archived_at: Time.current)
 
-        'Template has been archived.'
+        I18n.t('template_has_been_archived')
       end
 
     redirect_back(fallback_location: root_path, notice:)
@@ -100,7 +103,7 @@ class TemplatesController < ApplicationController
     params.require(:template).permit(
       :name,
       { schema: [%i[attachment_uuid name]],
-        submitters: [%i[name uuid]],
+        submitters: [%i[name uuid is_requester linked_to_uuid invite_by_uuid email]],
         fields: [[:uuid, :submitter_uuid, :name, :type,
                   :required, :readonly, :default_value,
                   :title, :description,
@@ -113,14 +116,15 @@ class TemplatesController < ApplicationController
   end
 
   def authorized_clone_account_id?(account_id)
-    true_user.account_id.to_s == account_id.to_s || true_user.account.linked_accounts.exists?(id: account_id)
+    true_user.account_id.to_s == account_id.to_s ||
+      true_user.account.linked_accounts.accessible_by(current_ability).exists?(id: account_id)
   end
 
   def maybe_redirect_to_template(template)
     if template.account == current_account
       redirect_to(edit_template_path(@template))
     else
-      redirect_back(fallback_location: root_path, notice: 'Template has been clonned')
+      redirect_back(fallback_location: root_path, notice: I18n.t('template_has_been_cloned'))
     end
   end
 

app/controllers/templates_folders_controller.rb

@@ -9,9 +9,9 @@ class TemplatesFoldersController < ApplicationController
     @template.folder = TemplateFolders.find_or_create_by_name(current_user, params[:name])
 
     if @template.save
-      redirect_back(fallback_location: template_path(@template), notice: 'Document template has been moved')
+      redirect_back(fallback_location: template_path(@template), notice: I18n.t('document_template_has_been_moved'))
     else
-      redirect_back(fallback_location: template_path(@template), notice: 'Unable to move template into folder')
+      redirect_back(fallback_location: template_path(@template), notice: I18n.t('unable_to_move_template_into_folder'))
     end
   end
 

app/controllers/templates_form_preview_controller.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class TemplatesFormPreviewController < ApplicationController
-  PRELOAD_ALL_PAGES_AMOUNT = 200
-
   layout 'form'
 
   load_and_authorize_resource :template
@@ -15,20 +13,7 @@ class TemplatesFormPreviewController < ApplicationController
 
     @submitter.submission.submitters = @template.submitters.map { |item| Submitter.new(uuid: item['uuid']) }
 
-    ActiveRecord::Associations::Preloader.new(
+    Submitters.preload_with_pages(@submitter)
-      records: [@submitter],
-      associations: [submission: [:template, { template_schema_documents: :blob }]]
-    ).call
-
-    total_pages =
-      @submitter.submission.template_schema_documents.sum { |e| e.metadata.dig('pdf', 'number_of_pages').to_i }
-
-    if total_pages < PRELOAD_ALL_PAGES_AMOUNT
-      ActiveRecord::Associations::Preloader.new(
-        records: @submitter.submission.template_schema_documents,
-        associations: [:blob, { preview_images_attachments: :blob }]
-      ).call
-    end
 
     @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
                                                   .preload(:blob).index_by(&:uuid)

app/controllers/templates_preferences_controller.rb

@@ -9,7 +9,7 @@ class TemplatesPreferencesController < ApplicationController
     authorize!(:update, @template)
 
     @template.preferences = @template.preferences.merge(template_params[:preferences])
-    @template.preferences = @template.preferences.reject { |_, v| v.is_a?(String) && v.blank? }
+    @template.preferences = @template.preferences.reject { |_, v| (v.is_a?(String) || v.is_a?(Hash)) && v.blank? }
     @template.save!
 
     head :ok
@@ -22,12 +22,18 @@ class TemplatesPreferencesController < ApplicationController
       preferences: %i[bcc_completed request_email_subject request_email_body
                       documents_copy_email_subject documents_copy_email_body
                       documents_copy_email_enabled documents_copy_email_attach_audit
+                      completed_notification_email_attach_documents
+                      completed_redirect_url
+                      submitters_order
                       completed_notification_email_subject completed_notification_email_body
-                      completed_notification_email_enabled completed_notification_email_attach_audit]
+                      completed_notification_email_enabled completed_notification_email_attach_audit] +
+                      [completed_message: %i[title body]]
     ).tap do |attrs|
       attrs[:preferences] = attrs[:preferences].transform_values do |value|
         if %w[true false].include?(value)
           value == 'true'
+        elsif value.respond_to?(:compact_blank)
+          value.compact_blank
         else
           value
         end

app/controllers/templates_recipients_controller.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+class TemplatesRecipientsController < ApplicationController
+  load_and_authorize_resource :template
+
+  def create
+    authorize!(:update, @template)
+
+    @template.submitters =
+      submitters_params.map { |s| s.reject { |_, v| v.is_a?(String) && v.blank? } }
+
+    @template.save!
+
+    render json: { submitters: @template.submitters }
+  end
+
+  private
+
+  def submitters_params
+    params.require(:template).permit(
+      submitters: [%i[name uuid is_requester invite_by_uuid linked_to_uuid email option]]
+    ).fetch(:submitters, {}).values.filter_map do |s|
+      next if s[:uuid].blank?
+
+      if s[:is_requester] == '1' && s[:invite_by_uuid].blank?
+        s[:is_requester] = true
+      else
+        s.delete(:is_requester)
+      end
+
+      s.delete(:invite_by_uuid) if s[:invite_by_uuid].blank?
+
+      option = s.delete(:option)
+
+      if option.present?
+        case option
+        when 'is_requester'
+          s[:is_requester] = true
+        when 'not_set'
+          s.delete(:is_requester)
+          s.delete(:email)
+          s.delete(:linked_to_uuid)
+          s.delete(:invite_by_uuid)
+        when /\Alinked_to_(.*)\z/
+          s[:linked_to_uuid] = ::Regexp.last_match(-1)
+        when /\Ainvite_by_(.*)\z/
+          s[:invite_by_uuid] = ::Regexp.last_match(-1)
+        end
+      end
+
+      s
+    end
+  end
+end

app/controllers/templates_restore_controller.rb

@@ -6,6 +6,6 @@ class TemplatesRestoreController < ApplicationController
   def create
     @template.update!(archived_at: nil)
 
-    redirect_to template_path(@template), notice: 'Template has been unarchived'
+    redirect_to template_path(@template), notice: I18n.t('template_has_been_unarchived')
   end
 end

app/controllers/templates_uploads_controller.rb

@@ -15,11 +15,13 @@ class TemplatesUploadsController < ApplicationController
     documents = Templates::CreateAttachments.call(@template, url_params || params, extract_fields: true)
     schema = documents.map { |doc| { attachment_uuid: doc.uuid, name: doc.filename.base } }
 
-    fields = Templates::ProcessDocument.normalize_attachment_fields(@template, documents)
+    if @template.fields.blank?
+      @template.fields = Templates::ProcessDocument.normalize_attachment_fields(@template, documents)
 
-    schema.each { |item| item['pending_fields'] = true } if fields.present?
+      schema.each { |item| item['pending_fields'] = true } if @template.fields.present?
+    end
 
-    @template.update!(schema:, fields:)
+    @template.update!(schema:)
 
     SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => @template.id)
 
@@ -31,7 +33,7 @@ class TemplatesUploadsController < ApplicationController
 
     raise if Rails.env.local?
 
-    redirect_to root_path, alert: 'Unable to upload file'
+    redirect_to root_path, alert: I18n.t('unable_to_update_file')
   end
 
   private
@@ -50,23 +52,17 @@ class TemplatesUploadsController < ApplicationController
   def create_file_params_from_url
     tempfile = Tempfile.new
     tempfile.binmode
-    tempfile.write(conn.get(Addressable::URI.parse(params[:url]).display_uri.to_s).body)
+    tempfile.write(DownloadUtils.call(params[:url]).body)
     tempfile.rewind
 
     file = ActionDispatch::Http::UploadedFile.new(
       tempfile:,
       filename: File.basename(
-        URI.decode_www_form_component(params[:filename].presence || params[:url])
+        URI.decode_www_form_component(params[:filename].presence || params[:url]), '.*'
       ),
       type: Marcel::MimeType.for(tempfile)
     )
 
     { files: [file] }
   end
-
-  def conn
-    Faraday.new do |faraday|
-      faraday.response :follow_redirects
-    end
-  end
 end

app/controllers/timestamp_server_controller.rb

@@ -14,12 +14,12 @@ class TimestampServerController < ApplicationController
     test_timeserver_url(@encrypted_config.value) if @encrypted_config.value.present?
 
     if @encrypted_config.value.present? ? @encrypted_config.save : @encrypted_config.delete
-      redirect_back fallback_location: settings_notifications_path, notice: 'Changes have been saved'
+      redirect_back fallback_location: settings_notifications_path, notice: I18n.t('changes_have_been_saved')
     else
-      redirect_back fallback_location: settings_notifications_path, alert: 'Unable to save'
+      redirect_back fallback_location: settings_notifications_path, alert: I18n.t('unable_to_save')
     end
   rescue SocketError, TimestampError, OpenSSL::Timestamp::TimestampError
-    redirect_back fallback_location: settings_notifications_path, alert: 'Invalid Timeserver'
+    redirect_back fallback_location: settings_notifications_path, alert: t('invalid_timeserver')
   end
 
   private

app/controllers/user_initials_controller.rb

@@ -9,7 +9,7 @@ class UserInitialsController < ApplicationController
   def update
     file = params[:file]
 
-    return redirect_to settings_profile_index_path, notice: 'Unable to save initials' if file.blank?
+    return redirect_to settings_profile_index_path, notice: I18n.t('unable_to_save_initials') if file.blank?
 
     blob = ActiveStorage::Blob.create_and_upload!(io: file.open,
                                                   filename: file.original_filename,
@@ -22,16 +22,16 @@ class UserInitialsController < ApplicationController
     )
 
     if @user_config.update(value: attachment.uuid)
-      redirect_to settings_profile_index_path, notice: 'Initials has been saved'
+      redirect_to settings_profile_index_path, notice: I18n.t('initials_has_been_saved')
     else
-      redirect_to settings_profile_index_path, notice: 'Unable to save initials'
+      redirect_to settings_profile_index_path, notice: I18n.t('unable_to_save_initials')
     end
   end
 
   def destroy
     @user_config.destroy
 
-    redirect_to settings_profile_index_path, notice: 'Initials has been removed'
+    redirect_to settings_profile_index_path, notice: I18n.t('initials_has_been_removed')
   end
 
   private

app/controllers/user_signatures_controller.rb

@@ -9,7 +9,7 @@ class UserSignaturesController < ApplicationController
   def update
     file = params[:file]
 
-    return redirect_to settings_profile_index_path, notice: 'Unable to save signature' if file.blank?
+    return redirect_to settings_profile_index_path, notice: I18n.t('unable_to_save_signature') if file.blank?
 
     blob = ActiveStorage::Blob.create_and_upload!(io: file.open,
                                                   filename: file.original_filename,
@@ -22,16 +22,16 @@ class UserSignaturesController < ApplicationController
     )
 
     if @user_config.update(value: attachment.uuid)
-      redirect_to settings_profile_index_path, notice: 'Signature has been saved'
+      redirect_to settings_profile_index_path, notice: I18n.t('signature_has_been_saved')
     else
-      redirect_to settings_profile_index_path, notice: 'Unable to save signature'
+      redirect_to settings_profile_index_path, notice: I18n.t('unable_to_save_signature')
     end
   end
 
   def destroy
     @user_config.destroy
 
-    redirect_to settings_profile_index_path, notice: 'Signature has been removed'
+    redirect_to settings_profile_index_path, notice: I18n.t('signature_has_been_removed')
   end
 
   private

app/controllers/users_controller.rb

@@ -35,14 +35,14 @@ class UsersController < ApplicationController
     if @user.save
       UserMailer.invitation_email(@user).deliver_later!
 
-      redirect_back fallback_location: settings_users_path, notice: 'User has been invited'
+      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
     end
   end
 
   def update
-    return redirect_to settings_users_path, notice: 'Unable to update user.' if Docuseal.demo?
+    return redirect_to settings_users_path, notice: I18n.t('unable_to_update_user') if Docuseal.demo?
 
     attrs = user_params.compact_blank.merge(user_params.slice(:archived_at))
     attrs.delete(:role) if !role_valid?(attrs[:role]) || current_user == @user
@@ -56,7 +56,7 @@ class UsersController < ApplicationController
     end
 
     if @user.update(attrs)
-      redirect_back fallback_location: settings_users_path, notice: 'User has been updated'
+      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
     end
@@ -64,12 +64,12 @@ class UsersController < ApplicationController
 
   def destroy
     if Docuseal.demo? || @user.id == current_user.id
-      return redirect_to settings_users_path, notice: 'Unable to remove user'
+      return redirect_to settings_users_path, notice: I18n.t('unable_to_remove_user')
     end
 
     @user.update!(archived_at: Time.current)
 
-    redirect_back fallback_location: settings_users_path, notice: 'User has been removed'
+    redirect_back fallback_location: settings_users_path, notice: I18n.t('user_has_been_removed')
   end
 
   private

app/controllers/verify_pdf_signature_controller.rb

@@ -9,30 +9,11 @@ class VerifyPdfSignatureController < ApplicationController
         HexaPDF::Document.new(io: file.open)
       end
 
-    cert_data =
+    trusted_certs = Accounts.load_trusted_certs(current_account)
-      if Docuseal.multitenant?
-        value = EncryptedConfig.find_by(account: current_account, key: EncryptedConfig::ESIGN_CERTS_KEY)&.value || {}
-
-        Docuseal::CERTS.merge(value)
-      else
-        EncryptedConfig.find_by(key: EncryptedConfig::ESIGN_CERTS_KEY)&.value || {}
-      end
-
-    default_pkcs = GenerateCertificate.load_pkcs(cert_data)
-
-    custom_certs = cert_data.fetch('custom', []).map do |e|
-      OpenSSL::PKCS12.new(Base64.urlsafe_decode64(e['data']), e['password'].to_s)
-    end
-
-    trusted_certs = [default_pkcs.certificate,
-                     *default_pkcs.ca_certs,
-                     *custom_certs.map(&:certificate),
-                     *custom_certs.flat_map(&:ca_certs).compact,
-                     *Docuseal.trusted_certs]
 
     render turbo_stream: turbo_stream.replace('result', partial: 'result',
                                                         locals: { pdfs:, files: params[:files], trusted_certs: })
   rescue HexaPDF::MalformedPDFError
-    render turbo_stream: turbo_stream.replace('result', html: helpers.tag.div('Invalid PDF', id: 'result'))
+    render turbo_stream: turbo_stream.replace('result', html: helpers.tag.div(I18n.t('invalid_pdf'), id: 'result'))
   end
 end

app/controllers/webhook_preferences_controller.rb

@@ -5,6 +5,7 @@ class WebhookPreferencesController < ApplicationController
     form.viewed
     form.started
     form.completed
+    form.declined
     template.created
     template.updated
     submission.created

app/controllers/webhook_secret_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class WebhookSecretController < ApplicationController
+  before_action :load_encrypted_config
+  authorize_resource :encrypted_config, parent: false
+
+  def index; end
+
+  def create
+    @encrypted_config.assign_attributes(value: {
+      encrypted_config_params[:key] => encrypted_config_params[:value]
+    }.compact_blank)
+
+    @encrypted_config.value.present? ? @encrypted_config.save! : @encrypted_config.delete
+
+    redirect_back(fallback_location: settings_webhooks_path, notice: I18n.t('webhook_secret_has_been_saved'))
+  end
+
+  private
+
+  def load_encrypted_config
+    @encrypted_config =
+      current_account.encrypted_configs.find_or_initialize_by(key: EncryptedConfig::WEBHOOK_SECRET_KEY)
+  end
+
+  def encrypted_config_params
+    params.require(:encrypted_config).permit(value: %i[key value]).fetch(:value, {})
+  end
+end

app/controllers/webhook_settings_controller.rb

@@ -11,15 +11,16 @@ class WebhookSettingsController < ApplicationController
 
     @encrypted_config.value.present? ? @encrypted_config.save! : @encrypted_config.delete
 
-    redirect_back(fallback_location: settings_webhooks_path, notice: 'Webhook URL has been saved.')
+    redirect_back(fallback_location: settings_webhooks_path, notice: I18n.t('webhook_url_has_been_saved'))
   end
 
   def update
     submitter = current_account.submitters.where.not(completed_at: nil).order(:id).last
 
-    SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id })
+    SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
+                                                       'encrypted_config_id' => @encrypted_config.id })
 
-    redirect_back(fallback_location: settings_webhooks_path, notice: 'Webhook request has been sent.')
+    redirect_back(fallback_location: settings_webhooks_path, notice: I18n.t('webhook_request_has_been_sent'))
   end
 
   private

app/javascript/application.js

@@ -24,6 +24,11 @@ import SubmitForm from './elements/submit_form'
 import PromptPassword from './elements/prompt_password'
 import EmailsTextarea from './elements/emails_textarea'
 import ToggleOnSubmit from './elements/toggle_on_submit'
+import PasswordInput from './elements/password_input'
+import SearchInput from './elements/search_input'
+import ToggleAttribute from './elements/toggle_attribute'
+import LinkedInput from './elements/linked_input'
+import CheckboxGroup from './elements/checkbox_group'
 
 import * as TurboInstantClick from './lib/turbo_instant_click'
 
@@ -85,9 +90,16 @@ safeRegisterElement('prompt-password', PromptPassword)
 safeRegisterElement('emails-textarea', EmailsTextarea)
 safeRegisterElement('toggle-cookies', ToggleCookies)
 safeRegisterElement('toggle-on-submit', ToggleOnSubmit)
+safeRegisterElement('password-input', PasswordInput)
+safeRegisterElement('search-input', SearchInput)
+safeRegisterElement('toggle-attribute', ToggleAttribute)
+safeRegisterElement('linked-input', LinkedInput)
+safeRegisterElement('checkbox-group', CheckboxGroup)
 
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {
+    document.addEventListener('turbo:submit-end', this.onSubmit)
+
     this.appElem = document.createElement('div')
 
     this.appElem.classList.add('md:h-screen')
@@ -95,6 +107,7 @@ safeRegisterElement('template-builder', class extends HTMLElement {
     this.app = createApp(TemplateBuilder, {
       template: reactive(JSON.parse(this.dataset.template)),
       backgroundColor: '#faf7f5',
+      locale: this.dataset.locale,
       withPhone: this.dataset.withPhone === 'true',
       withLogo: this.dataset.withLogo !== 'false',
       editable: this.dataset.editable !== 'false',
@@ -102,17 +115,29 @@ safeRegisterElement('template-builder', class extends HTMLElement {
       withPayment: this.dataset.withPayment === 'true',
       isPaymentConnected: this.dataset.isPaymentConnected === 'true',
       withFormula: this.dataset.withFormula === 'true',
+      withSendButton: this.dataset.withSendButton !== 'false',
+      withSignYourselfButton: this.dataset.withSignYourselfButton !== 'false',
       withConditions: this.dataset.withConditions === 'true',
       currencies: (this.dataset.currencies || '').split(',').filter(Boolean),
       acceptFileTypes: this.dataset.acceptFileTypes
     })
 
-    this.app.mount(this.appElem)
+    this.component = this.app.mount(this.appElem)
 
     this.appendChild(this.appElem)
   }
 
+  onSubmit = (e) => {
+    if (e.detail.success && e.detail?.formSubmission?.formElement?.id === 'submitters_form') {
+      e.detail.fetchResponse.response.json().then((data) => {
+        this.component.template.submitters = data.submitters
+      })
+    }
+  }
+
   disconnectedCallback () {
+    document.removeEventListener('turbo:submit-end', this.onSubmit)
+
     this.app?.unmount()
     this.appElem?.remove()
   }
@@ -125,7 +150,8 @@ safeRegisterElement('import-list', class extends HTMLElement {
     this.app = createApp(ImportList, {
       template: JSON.parse(this.dataset.template),
       multitenant: this.dataset.multitenant === 'true',
-      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content
+      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
+      i18n: JSON.parse(this.dataset.i18n || '{}')
     })
 
     this.app.mount(this.appElem)

app/javascript/application.scss

@@ -100,7 +100,7 @@ button[disabled] .enabled {
 .autocomplete {
   background: white;
   z-index: 1000;
-  font: 14px/22px "-apple-system", BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+  font: 16px/25px "-apple-system", BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
   overflow: auto;
   box-sizing: border-box;
   @apply border border-base-300 mt-1 rounded-md;
@@ -111,7 +111,7 @@ button[disabled] .enabled {
 }
 
 .autocomplete > div {
-  @apply px-2 py-1 font-normal text-sm;
+  @apply px-2 py-1.5 font-normal;
 }
 
 .autocomplete .group {

app/javascript/elements/checkbox_group.js

@@ -0,0 +1,15 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.items.forEach((item) => {
+      item.addEventListener('change', (e) => {
+        this.items.forEach((item) => {
+          item.checked = item === e.target && e.target.checked
+        })
+      })
+    })
+  }
+
+  get items () {
+    return this.querySelectorAll('input[type="checkbox"]')
+  }
+}

app/javascript/elements/linked_input.js

@@ -0,0 +1,31 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    if (this.target) {
+      this.input.value = this.target.value
+
+      this.target.addEventListener('input', (e) => {
+        this.input.value = e.target.value
+      })
+
+      this.target.addEventListener('linked-input.update', (e) => {
+        this.input.value = e.target.value
+      })
+    }
+  }
+
+  get input () {
+    return this.querySelector('input')
+  }
+
+  get target () {
+    if (this.dataset.targetId) {
+      const listItem = this.closest('[data-targets="dynamic-list.items"]')
+
+      if (listItem) {
+        return listItem.querySelector(`#${this.dataset.targetId}`)
+      } else {
+        return document.getElementById(this.dataset.targetId)
+      }
+    }
+  }
+}

app/javascript/elements/password_input.js

@@ -0,0 +1,35 @@
+import { target, targetable } from '@github/catalyst/lib/targetable'
+
+export default targetable(class extends HTMLElement {
+  static [target.static] = [
+    'visiblePasswordIcon',
+    'hiddenPasswordIcon',
+    'passwordInput',
+    'togglePasswordVisibility'
+  ]
+
+  connectedCallback () {
+    this.togglePasswordVisibility.addEventListener('click', this.handleTogglePasswordVisibility)
+    document.addEventListener('turbo:submit-start', this.setInitialPasswordType)
+  }
+
+  disconnectedCallback () {
+    this.togglePasswordVisibility.removeEventListener('click', this.handleTogglePasswordVisibility)
+    document.removeEventListener('turbo:submit-start', this.setInitialPasswordType)
+  }
+
+  handleTogglePasswordVisibility = () => {
+    this.passwordInput.type = this.passwordInput.type === 'password' ? 'text' : 'password'
+    this.toggleIcon()
+  }
+
+  setInitialPasswordType = () => {
+    this.passwordInput.type = 'password'
+    this.toggleIcon()
+  }
+
+  toggleIcon = () => {
+    this.visiblePasswordIcon.classList.toggle('hidden', this.passwordInput.type === 'password')
+    this.hiddenPasswordIcon.classList.toggle('hidden', this.passwordInput.type === 'text')
+  }
+})

app/javascript/elements/search_input.js

@@ -0,0 +1,25 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.input.addEventListener('focus', () => {
+      if (this.title) {
+        this.title.classList.add('hidden', 'md:block')
+        this.input.classList.add('w-60')
+      }
+    })
+
+    this.input.addEventListener('blur', (e) => {
+      if (this.title && !e.target.value) {
+        this.title.classList.remove('hidden')
+        this.input.classList.remove('w-60')
+      }
+    })
+  }
+
+  get input () {
+    return this.querySelector('input')
+  }
+
+  get title () {
+    return document.querySelector(this.dataset.title)
+  }
+}

app/javascript/elements/submitter_autocomplete.js

@@ -24,6 +24,7 @@ export default class extends HTMLElement {
 
       if (input && item[field]) {
         input.value = item[field]
+        input.dispatchEvent(new CustomEvent('linked-input.update', { bubbles: true }))
       }
 
       if (textarea && item[field]) {

app/javascript/elements/toggle_attribute.js

@@ -0,0 +1,28 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.input.addEventListener('change', (event) => {
+      if (this.dataset.attribute) {
+        this.target[this.dataset.attribute] = event.target.checked
+      }
+
+      if (this.dataset.className) {
+        this.target.classList.toggle(this.dataset.className, event.target.value !== this.dataset.value)
+        if (this.dataset.className === 'hidden' && this.target.tagName === 'INPUT') {
+          this.target.disabled = event.target.value !== this.dataset.value
+        }
+      }
+
+      if (this.dataset.attribute === 'disabled') {
+        this.target.value = ''
+      }
+    })
+  }
+
+  get input () {
+    return this.querySelector('input[type="checkbox"]') || this.querySelector('select')
+  }
+
+  get target () {
+    return document.getElementById(this.dataset.targetId)
+  }
+}

app/javascript/elements/turbo_modal.js

@@ -22,7 +22,7 @@ export default actionable(class extends HTMLElement {
   }
 
   onSubmit = (e) => {
-    if (e.detail.success) {
+    if (e.detail.success && e.detail?.formSubmission?.formElement?.dataset?.closeOnSubmit !== 'false') {
       this.close()
     }
   }

app/javascript/form.js

@@ -14,14 +14,18 @@ safeRegisterElement('submission-form', class extends HTMLElement {
 
     this.app = createApp(Form, {
       submitter: JSON.parse(this.dataset.submitter),
+      inviteSubmitters: JSON.parse(this.dataset.inviteSubmitters),
       canSendEmail: this.dataset.canSendEmail === 'true',
       previousSignatureValue: this.dataset.previousSignatureValue,
       goToLast: this.dataset.goToLast === 'true',
       isDemo: this.dataset.isDemo === 'true',
       attribution: this.dataset.attribution !== 'false',
       scrollPadding: this.dataset.scrollPadding || '-80px',
+      language: this.dataset.language,
       dryRun: this.dataset.dryRun === 'true',
       expand: ['true', 'false'].includes(this.dataset.expand) ? this.dataset.expand === 'true' : null,
+      withSignatureId: this.dataset.withSignatureId === 'true',
+      requireSigningReason: this.dataset.requireSigningReason === 'true',
       withConfetti: this.dataset.withConfetti !== 'false',
       withDisclosure: this.dataset.withDisclosure === 'true',
       withTypedSignature: this.dataset.withTypedSignature !== 'false',

app/javascript/rollbar.js

@@ -18,9 +18,15 @@ if (token) {
     transform (payload) {
       payload.body.telemetry = []
 
-      const string = JSON.stringify(payload)
+      if (payload.request.query_string) {
+        payload.request.query_string = ''
+      }
 
-      return JSON.parse(string.replace(/(\/[des]\/)\w{6}/g, (_, m) => m))
+      if (payload.request.url) {
+        payload.request.url = payload.request.url.replace(/(\/[sdep]\/)(\w{5})[^/]+/, '$1$2')
+      }
+
+      return payload
     },
     payload: {
       client: {

app/javascript/submission_form/area.vue

@@ -3,10 +3,10 @@
     class="field-area flex absolute lg:text-base -outline-offset-1"
     dir="auto"
     :style="computedStyle"
-    :class="{ 'text-[1.5vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars, 'cursor-default': !submittable, 'border border-red-100 bg-red-100 cursor-pointer': submittable, 'border border-red-100': !isActive && submittable, 'bg-opacity-80': !isActive && !isValueSet && submittable, 'field-area-active outline-red-500 outline-dashed outline-2 z-10': isActive && submittable, 'bg-opacity-40': (isActive || isValueSet) && submittable }"
+    :class="{ 'font-serif': field.preferences?.font === 'Times', 'text-[1.6vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars, 'cursor-default': !submittable, 'border border-red-100 bg-red-100 cursor-pointer': submittable, 'border border-red-100': !isActive && submittable, 'bg-opacity-80': !isActive && !isValueSet && submittable, 'field-area-active outline-red-500 outline-dashed outline-2 z-10': isActive && submittable, 'bg-opacity-40': (isActive || isValueSet) && submittable }"
   >
     <div
-      v-if="!isActive && !isValueSet && field.type !== 'checkbox' && submittable && !area.option_uuid"
+      v-if="(!withFieldPlaceholder || !field.name || field.type === 'cells') && !isActive && !isValueSet && field.type !== 'checkbox' && submittable && !area.option_uuid"
       class="absolute top-0 bottom-0 right-0 left-0 items-center justify-center h-full w-full"
     >
       <span
@@ -29,12 +29,12 @@
         {{ optionValue(option) }}
       </template>
       <template v-else>
-        {{ field.name || fieldNames[field.type] }}
+        {{ field.title || field.name || fieldNames[field.type] }}
         <template v-if="field.type === 'checkbox' && !field.name">
           {{ fieldIndex + 1 }}
         </template>
         <template v-else-if="!field.required && field.type !== 'checkbox'">
-          (optional)
+          ({{ t('optional') }})
         </template>
       </template>
     </div>
@@ -54,18 +54,44 @@
       class="object-contain mx-auto"
       :src="stamp.url"
     >
-    <img
+    <div
       v-else-if="field.type === 'signature' && signature"
-      class="object-contain mx-auto"
+      class="flex flex-col justify-between h-full overflow-hidden"
-      :src="signature.url"
     >
+      <div
+        class="flex-grow flex overflow-hidden"
+        style="min-height: 50%"
+      >
+        <img
+          class="object-contain mx-auto"
+          :src="signature.url"
+        >
+      </div>
+      <div
+        v-if="withSignatureId"
+        class="w-full mt-1 text-[1vw] lg:text-[0.55rem] lg:leading-[0.65rem]"
+      >
+        <div class="truncate uppercase">
+          ID: {{ signature.uuid }}
+        </div>
+        <div>
+          {{ t('reason') }}: {{ values[field.preferences?.reason_field_uuid] || t('digitally_signed_by') }} {{ submitter.name }}
+          <template v-if="submitter.email">
+            &lt;{{ submitter.email }}&gt;
+          </template>
+        </div>
+        <div>
+          {{ new Date(signature.created_at).toLocaleString(undefined, { year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric', timeZoneName: 'short' }) }}
+        </div>
+      </div>
+    </div>
     <img
       v-else-if="field.type === 'initials' && initials"
       class="object-contain mx-auto"
       :src="initials.url"
     >
     <div
-      v-else-if="field.type === 'file' || field.type === 'payment'"
+      v-else-if="(field.type === 'file' || field.type === 'payment') && attachments.length"
       class="px-0.5 flex flex-col justify-center"
     >
       <a
@@ -75,7 +101,7 @@
         :href="attachment.url"
       >
         <IconPaperclip
-          class="inline w-[1.5vw] h-[1.5vw] lg:w-4 lg:h-4"
+          class="inline w-[1.6vw] h-[1.6vw] lg:w-4 lg:h-4"
         />
         {{ attachment.filename }}
       </a>
@@ -160,7 +186,12 @@
       class="flex items-center px-0.5 w-full"
       :class="alignClasses[field.preferences?.align]"
     >
-      <span v-if="Array.isArray(modelValue)">
+      <span
+        v-if="field && field.name && withFieldPlaceholder && !modelValue && modelValue !== 0"
+        class="whitespace-pre-wrap text-gray-400"
+        :class="{ 'w-full': field.preferences?.align }"
+      >{{ field.name }}</span>
+      <span v-else-if="Array.isArray(modelValue)">
         {{ modelValue.join(', ') }}
       </span>
       <span v-else-if="field.type === 'date'">
@@ -193,6 +224,16 @@ export default {
       type: Object,
       required: true
     },
+    submitter: {
+      type: Object,
+      required: false,
+      default: () => ({})
+    },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     isValueSet: {
       type: Boolean,
       required: false,
@@ -203,6 +244,11 @@ export default {
       required: false,
       default: '-80px'
     },
+    withFieldPlaceholder: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     submittable: {
       type: Boolean,
       required: false,
@@ -213,6 +259,11 @@ export default {
       required: false,
       default: ''
     },
+    values: {
+      type: Object,
+      required: false,
+      default: () => ({})
+    },
     isActive: {
       type: Boolean,
       required: false,
@@ -364,7 +415,7 @@ export default {
     modelValue () {
       this.$nextTick(() => {
         if (['date', 'text', 'number'].includes(this.field.type) && this.$refs.textContainer && (this.textOverflowChars === 0 || (this.textOverflowChars - 4) > `${this.modelValue}`.length)) {
-          this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? `${this.modelValue}`.length : 0
+          this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? `${this.modelValue || (this.withFieldPlaceholder ? this.field.name : '')}`.length : 0
         }
       })
     }
@@ -372,7 +423,7 @@ export default {
   mounted () {
     this.$nextTick(() => {
       if (['date', 'text', 'number'].includes(this.field.type) && this.$refs.textContainer) {
-        this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? `${this.modelValue}`.length : 0
+        this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? `${this.modelValue || (this.withFieldPlaceholder ? this.field.name : '')}`.length : 0
       }
     })
   },

app/javascript/submission_form/areas.vue

@@ -1,6 +1,6 @@
 <template>
   <template
-    v-for="step in steps"
+    v-for="(step, stepIndex) in steps"
     :key="step[0].uuid"
   >
     <template
@@ -18,16 +18,20 @@
           <FieldArea
             :ref="setAreaRef"
             v-model="values[field.uuid]"
+            :values="values"
             :field="field"
             :area="area"
-            :submittable="true"
+            :submittable="submittable"
             :field-index="fieldIndex"
             :scroll-padding="scrollPadding"
+            :submitter="submitter"
+            :with-field-placeholder="withFieldPlaceholder"
+            :with-signature-id="withSignatureId"
             :is-active="currentStep === step"
-            :with-label="withLabel"
+            :with-label="withLabel && !withFieldPlaceholder && step.length < 2"
             :is-value-set="step.some((f) => f.uuid in values)"
             :attachments-index="attachmentsIndex"
-            @click="$emit('focus-step', step)"
+            @click="$emit('focus-step', stepIndex)"
           />
         </Teleport>
       </template>
@@ -49,11 +53,30 @@ export default {
       required: false,
       default: () => []
     },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    submittable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    submitter: {
+      type: Object,
+      required: true
+    },
     values: {
       type: Object,
       required: false,
       default: () => ({})
     },
+    withFieldPlaceholder: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     scrollPadding: {
       type: String,
       required: false,
@@ -69,6 +92,11 @@ export default {
       required: false,
       default: true
     },
+    scrollEl: {
+      type: Object,
+      required: false,
+      default: null
+    },
     currentStep: {
       type: Array,
       required: false,
@@ -103,7 +131,20 @@ export default {
         if (container.style.overflow === 'hidden') {
           this.scrollInContainer(areaRef.$el)
         } else {
-          areaRef.$refs.scrollToElem.scrollIntoView({ behavior: 'smooth', block: 'start' })
+          const targetRect = areaRef.$refs.scrollToElem.getBoundingClientRect()
+          const scrollEl = this.scrollEl || window
+
+          let rootRect = {}
+
+          if (this.scrollEl === document.documentElement) {
+            rootRect = this.scrollEl.getBoundingClientRect()
+          } else {
+            const root = this.$root.$el?.parentNode?.classList?.contains('ds') ? this.$root.$el : document.body
+
+            rootRect = root.getBoundingClientRect()
+          }
+
+          scrollEl.scrollTo({ top: targetRect.top - rootRect.top, behavior: 'smooth' })
         }
 
         return true
@@ -122,7 +163,7 @@ export default {
 
       const targetTopRelativeToBox = targetRect.top - boxRect.top
 
-      scrollbox.scrollTop = targetTopRelativeToBox - container.offsetHeight + formContainer.offsetHeight + target.offsetHeight + padding
+      scrollbox.scrollTo({ top: targetTopRelativeToBox - container.offsetHeight + formContainer.offsetHeight + target.offsetHeight + padding, behavior: 'smooth' })
     },
     setAreaRef (el) {
       if (el) {

app/javascript/submission_form/completed.vue

@@ -10,7 +10,7 @@
         :height="30"
       />
       <span>
-        {{ completedMessage.title || t('form_has_been_completed') }}
+        {{ completedMessage.title || (hasSignatureFields ? (hasMultipleDocuments ? t('documents_have_been_signed') : t('document_has_been_signed')) : t('form_has_been_completed')) }}
       </span>
     </div>
     <div
@@ -88,7 +88,7 @@
       v-if="attribution"
       class="text-center mt-4"
     >
-      {{ t('signed_with') }}
+      {{ t('powered_by') }}
       <a
         href="https://www.docuseal.co/start"
         target="_blank"
@@ -129,6 +129,16 @@ export default {
       required: false,
       default: true
     },
+    hasSignatureFields: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    hasMultipleDocuments: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withDownloadButton: {
       type: Boolean,
       required: false,
@@ -181,6 +191,10 @@ export default {
         spread: 140
       })
     }
+
+    if (window.decline_button) {
+      window.decline_button.setAttribute('disabled', 'true')
+    }
   },
   methods: {
     sendCopyToEmail () {
@@ -208,7 +222,7 @@ export default {
             this.downloadUrls(urls)
           }
         } else {
-          alert('Failed to download files')
+          alert(this.t('failed_to_download_files'))
         }
       })
     },

app/javascript/submission_form/date_step.vue

@@ -43,6 +43,7 @@
         :required="field.required"
         type="date"
         :name="`values[${field.uuid}]`"
+        @keydown.enter="onEnter"
         @focus="$emit('focus')"
       >
     </div>
@@ -78,7 +79,7 @@ export default {
       default: ''
     }
   },
-  emits: ['update:model-value', 'focus'],
+  emits: ['update:model-value', 'focus', 'submit'],
   computed: {
     value: {
       set (value) {
@@ -90,6 +91,13 @@ export default {
     }
   },
   methods: {
+    onEnter (e) {
+      if (this.modelValue) {
+        e.preventDefault()
+
+        this.$emit('submit')
+      }
+    },
     setCurrentDate () {
       const inputEl = this.$refs.input
 

app/javascript/submission_form/form.vue

@@ -3,12 +3,22 @@
     ref="areas"
     :steps="stepFields"
     :values="values"
+    :with-field-placeholder="withFieldPlaceholder"
+    :submitter="submitter"
+    :scroll-el="scrollEl"
+    :with-signature-id="withSignatureId"
     :attachments-index="attachmentsIndex"
     :with-label="!isAnonymousChecboxes && showFieldNames"
     :current-step="currentStepFields"
     :scroll-padding="scrollPadding"
     @focus-step="[saveStep(), currentField.type !== 'checkbox' ? isFormVisible = true : '', goToStep($event, false, true)]"
   />
+  <FieldAreas
+    :steps="readonlyConditionalFields.map((e) => [e])"
+    :values="readonlyConditionalFields.reduce((acc, f) => { acc[f.uuid] = f.default_value; return acc }, {})"
+    :submitter="submitter"
+    :submittable="false"
+  />
   <FormulaFieldAreas
     v-if="formulaFields.length"
     :fields="formulaFields"
@@ -28,8 +38,11 @@
     <template v-else-if="alwaysMinimize">
       {{ t('next') }}
     </template>
+    <template v-else-if="isShowContinue">
+      {{ t('continue') }}
+    </template>
     <template v-else>
-      {{ t('submit_form') }}
+      {{ t('start_now') }}
     </template>
     <IconArrowsDiagonal
       class="absolute right-0 mr-4"
@@ -49,7 +62,7 @@
       id="minimize_form_button"
       class="absolute right-0 mr-2 mt-2 top-0 hidden md:block"
       :title="t('minimize')"
-      @click.prevent="isFormVisible = false"
+      @click.prevent="minimizeForm"
     >
       <IconArrowsDiagonalMinimize2
         :width="20"
@@ -60,7 +73,7 @@
       :class="{ 'md:px-4': isBreakpointMd }"
     >
       <form
-        v-if="!isCompleted"
+        v-if="!isCompleted && !isInvite"
         ref="form"
         :action="submitPath"
         method="post"
@@ -102,6 +115,7 @@
             v-model="values[currentField.uuid]"
             :show-field-names="showFieldNames"
             :field="currentField"
+            @submit="submitStep"
             @focus="scrollIntoField(currentField)"
           />
           <div v-else-if="currentField.type === 'select'">
@@ -190,7 +204,7 @@
                 <span
                   @click="scrollIntoField(currentField)"
                 >
-                  {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ stepFields.length === currentStep + 1 ? t('submit') : t('next') }}</span>.
+                  {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ submitButtonText }}</span>.
                 </span>
               </div>
               <div
@@ -254,7 +268,7 @@
               >
                 <template v-if="isAnonymousChecboxes || !showFieldNames">
                   <span class="text-xl">
-                    {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ stepFields.length === currentStep + 1 ? t('submit') : t('next') }}</span>.
+                    {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ submitButtonText }}</span>.
                   </span>
                   <input
                     v-for="field in currentStepFields"
@@ -322,20 +336,23 @@
             ref="currentStep"
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
+            :reason="values[currentField.preferences?.reason_field_uuid]"
             :field="currentField"
             :previous-value="previousSignatureValueFor(currentField) || previousSignatureValue"
             :with-typed-signature="withTypedSignature"
             :remember-signature="rememberSignature"
             :attachments-index="attachmentsIndex"
-            :button-text="buttonText"
+            :require-signing-reason="requireSigningReason"
+            :button-text="submitButtonText"
             :dry-run="dryRun"
             :with-disclosure="withDisclosure"
             :with-qr-button="withQrButton"
             :submitter="submitter"
             :show-field-names="showFieldNames"
+            @update:reason="values[currentField.preferences?.reason_field_uuid] = $event"
             @attached="attachments.push($event)"
             @start="scrollIntoField(currentField)"
-            @minimize="isFormVisible = false"
+            @minimize="minimizeForm"
           />
           <InitialsStep
             v-else-if="currentField.type === 'initials'"
@@ -351,7 +368,7 @@
             @attached="attachments.push($event)"
             @start="scrollIntoField(currentField)"
             @focus="scrollIntoField(currentField)"
-            @minimize="isFormVisible = false"
+            @minimize="minimizeForm"
           />
           <AttachmentStep
             v-else-if="currentField.type === 'file'"
@@ -384,6 +401,7 @@
             v-model="values[currentField.uuid]"
             :field="currentField"
             :submitter-slug="submitterSlug"
+            :values="values"
             @attached="attachments.push($event)"
             @focus="scrollIntoField(currentField)"
             @submit="submitStep"
@@ -406,7 +424,7 @@
                 class="mr-1 animate-spin"
               />
               <span>
-                {{ buttonText }}
+                {{ submitButtonText }}
               </span><span
                 v-if="isSubmitting"
                 class="w-6 flex justify-start mr-1"
@@ -421,10 +439,21 @@
           </div>
         </div>
       </form>
+      <InviteForm
+        v-else-if="isInvite"
+        :submitters="inviteSubmitters"
+        :submitter-slug="submitterSlug"
+        :authenticity-token="authenticityToken"
+        :url="baseUrl + submitPath + '/invite'"
+        :style="{ maxWidth: isBreakpointMd ? '582px' : '' }"
+        @success="[isInvite = false, performComplete($event)]"
+      />
       <FormCompleted
         v-else
         :is-demo="isDemo"
         :attribution="attribution"
+        :has-signature-fields="stepFields.some((fields) => fields.some((f) => ['signature', 'initials'].includes(f.type)))"
+        :has-multiple-documents="hasMultipleDocuments"
         :completed-button="completedRedirectUrl ? {} : completedButton"
         :completed-message="completedRedirectUrl ? {} : completedMessage"
         :with-send-copy-button="withSendCopyButton && !completedRedirectUrl"
@@ -444,7 +473,7 @@
             href="#"
             class="inline border border-base-300 h-3 w-3 rounded-full mx-1 mt-1"
             :class="{ 'bg-base-300': index === currentStep, 'bg-base-content': (index < currentStep && stepFields[index].every((f) => !f.required || ![null, undefined, ''].includes(values[f.uuid]))) || isCompleted, 'bg-white': index > currentStep }"
-            @click.prevent="isCompleted ? '' : [saveStep(), goToStep(step, true)]"
+            @click.prevent="isCompleted ? '' : [saveStep(), goToStep(index, true)]"
           />
         </div>
       </div>
@@ -470,6 +499,7 @@ import TextStep from './text_step'
 import NumberStep from './number_step'
 import DateStep from './date_step'
 import MarkdownContent from './markdown_content'
+import InviteForm from './invite_form'
 import FormCompleted from './completed'
 import { IconInnerShadowTop, IconArrowsDiagonal, IconWritingSign, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
 import AppearsOn from './appears_on'
@@ -507,6 +537,7 @@ export default {
     IconWritingSign,
     AttachmentStep,
     InitialsStep,
+    InviteForm,
     MultiSelectStep,
     IconInnerShadowTop,
     DateStep,
@@ -533,11 +564,26 @@ export default {
       type: Object,
       required: true
     },
+    inviteSubmitters: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     scrollPadding: {
       type: String,
       required: false,
       default: '-80px'
     },
+    requireSigningReason: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     canSendEmail: {
       type: Boolean,
       required: false,
@@ -548,6 +594,16 @@ export default {
       required: false,
       default: () => []
     },
+    withFieldPlaceholder: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    scrollEl: {
+      type: Object,
+      required: false,
+      default: null
+    },
     onComplete: {
       type: Function,
       required: false,
@@ -704,9 +760,11 @@ export default {
   data () {
     return {
       isCompleted: false,
+      isInvite: false,
       isFormVisible: this.expand !== false,
       showFillAllRequiredFields: false,
       currentStep: 0,
+      isShowContinue: false,
       enableScrollIntoField: true,
       phoneVerifiedValues: {},
       orientation: screen?.orientation?.type,
@@ -719,9 +777,15 @@ export default {
     isMobile () {
       return /android|iphone|ipad/i.test(navigator.userAgent)
     },
-    buttonText () {
+    submitButtonText () {
-      if (this.alwaysMinimize || this.stepFields.length === this.currentStep + 1) {
+      if (this.alwaysMinimize) {
         return this.t('submit')
+      } else if (this.stepFields.length === this.currentStep + 1) {
+        if (this.currentField.type === 'signature') {
+          return this.t('sign_and_complete')
+        } else {
+          return this.t('complete')
+        }
       } else {
         return this.t('next')
       }
@@ -729,6 +793,18 @@ export default {
     alwaysMinimize () {
       return this.minimize || (this.orientation?.includes('landscape') && this.isMobile && parseInt(window.innerHeight) < 550)
     },
+    hasMultipleDocuments () {
+      return Object.keys(
+        this.stepFields.reduce((acc, fields) => {
+          fields.forEach((f) => {
+            f.areas?.forEach((a) => {
+              acc[a.attachment_uuid] = 1
+            })
+          })
+          return acc
+        }, {})
+      ).filter(Boolean).length > 1
+    },
     currentStepFields () {
       return this.stepFields[this.currentStep] || []
     },
@@ -773,6 +849,9 @@ export default {
     currentField () {
       return this.currentStepFields[0]
     },
+    readonlyConditionalFields () {
+      return this.fields.filter((f) => f.readonly && f.conditions?.length && this.checkFieldConditions(f))
+    },
     stepFields () {
       return this.fields.filter((f) => !f.readonly).reduce((acc, f) => {
         const prevStep = acc[acc.length - 1]
@@ -789,7 +868,7 @@ export default {
       }, [])
     },
     formulaFields () {
-      return this.fields.filter((f) => f.preferences?.formula)
+      return this.fields.filter((f) => f.preferences?.formula && f.type !== 'payment')
     },
     attachmentsIndex () {
       return this.attachments.reduce((acc, a) => {
@@ -850,11 +929,11 @@ export default {
     }
 
     if (document.body?.clientWidth >= 768 && this.expand !== true && ['signature', 'initials', 'file', 'image'].includes(this.currentField?.type)) {
-      this.isFormVisible = false
+      this.minimizeForm()
     }
 
     if (this.alwaysMinimize) {
-      this.isFormVisible = false
+      this.minimizeForm()
     }
 
     if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) {
@@ -894,18 +973,22 @@ export default {
     checkFieldConditions (field) {
       if (field.conditions?.length) {
         return field.conditions.reduce((acc, c) => {
+          const field = this.fieldsUuidIndex[c.field_uuid]
+
+          if (['not_empty', 'checked', 'equal', 'contains'].includes(c.action) && field && !this.checkFieldConditions(field)) {
+            return false
+          }
+
           if (['empty', 'unchecked'].includes(c.action)) {
             return acc && isEmpty(this.values[c.field_uuid])
           } else if (['not_empty', 'checked'].includes(c.action)) {
             return acc && !isEmpty(this.values[c.field_uuid])
-          } else if (['equal', 'contains'].includes(c.action)) {
+          } else if (['equal', 'contains'].includes(c.action) && field) {
-            const field = this.fieldsUuidIndex[c.field_uuid]
             const option = field.options.find((o) => o.uuid === c.value)
             const values = [this.values[c.field_uuid]].flat()
 
             return acc && values.includes(this.optionValue(option, field.options.indexOf(option)))
-          } else if (['not_equal', 'does_not_contain'].includes(c.action)) {
+          } else if (['not_equal', 'does_not_contain'].includes(c.action) && field) {
-            const field = this.fieldsUuidIndex[c.field_uuid]
             const option = field.options.find((o) => o.uuid === c.value)
             const values = [this.values[c.field_uuid]].flat()
 
@@ -995,8 +1078,8 @@ export default {
         return null
       }
     },
-    goToStep (step, scrollToArea = false, clickUpload = false) {
+    goToStep (stepIndex, scrollToArea = false, clickUpload = false) {
-      this.currentStep = this.stepFields.indexOf(step)
+      this.currentStep = stepIndex
       this.showFillAllRequiredFields = false
 
       this.$nextTick(() => {
@@ -1004,7 +1087,7 @@ export default {
 
         if (!this.isCompleted) {
           if (scrollToArea) {
-            this.scrollIntoField(step[0])
+            this.scrollIntoField(this.currentField)
           }
 
           this.enableScrollIntoField = false
@@ -1077,7 +1160,7 @@ export default {
         const formData = new FormData(this.$refs.form)
         const isLastStep = this.currentStep === this.stepFields.length - 1
 
-        if (isLastStep && !emptyRequiredField) {
+        if (isLastStep && !emptyRequiredField && !this.inviteSubmitters.length) {
           formData.append('completed', 'true')
         }
 
@@ -1093,39 +1176,29 @@ export default {
           if (response.status === 422 || response.status === 500) {
             const data = await response.json()
 
-            alert(data.error || 'Value is invalid')
+            const i18nError = data.error ? this.t(data.error.replace(/\s+/g, '_').toLowerCase()) : ''
+
+            alert(i18nError !== data.error ? i18nError : (data.error || this.t('value_is_invalid')))
 
             return Promise.reject(new Error(data.error))
           }
 
-          if (isLastStep) {
-            this.isSecondWalkthrough = true
-          }
-
           const nextStep = (isLastStep && emptyRequiredField) || this.stepFields[this.currentStep + 1]
 
           if (nextStep) {
             if (this.alwaysMinimize) {
-              this.isFormVisible = false
+              this.minimizeForm()
             }
 
-            this.goToStep(nextStep, this.autoscrollFields)
+            this.goToStep(this.stepFields.indexOf(nextStep), this.autoscrollFields)
 
             if (emptyRequiredField === nextStep) {
               this.showFillAllRequiredFields = true
             }
+          } else if (this.inviteSubmitters.length) {
+            this.isInvite = true
           } else {
-            this.isCompleted = true
+            this.performComplete(response)
-
-            const respData = await response.text()
-
-            if (respData) {
-              this.onComplete(JSON.parse(respData))
-            }
-
-            if (this.completedRedirectUrl) {
-              window.location.href = this.completedRedirectUrl
-            }
           }
         }).catch(error => {
           console.error(error)
@@ -1134,13 +1207,32 @@ export default {
         })
       }).catch(error => {
         if (error?.message === 'Image too small') {
-          alert('Signature is too small - please redraw.')
+          alert(this.t('signature_is_too_small_please_redraw'))
         } else {
           console.log(error)
         }
       }).finally(() => {
         this.isSubmitting = false
       })
+    },
+    minimizeForm () {
+      this.isFormVisible = false
+      this.isShowContinue = true
+    },
+    async performComplete (resp) {
+      this.isCompleted = true
+
+      if (resp?.text) {
+        const respData = await resp.text()
+
+        if (respData) {
+          this.onComplete(JSON.parse(respData))
+        }
+      }
+
+      if (this.completedRedirectUrl) {
+        window.location.href = this.completedRedirectUrl
+      }
     }
   }
 }

app/javascript/submission_form/i18n.js

@@ -1,4 +1,6 @@
 const en = {
+  complete: 'Complete',
+  sign_and_complete: 'Sign and Complete',
   text: 'Text',
   by_clicking_you_agree_to_the: 'By clicking "{button}", you agree to the',
   electronic_signature_disclosure: 'Electronic Signature Disclosure',
@@ -6,15 +8,29 @@ const en = {
   signature: 'Signature',
   initials: 'Initials',
   drawn_signature_on_a_touchscreen_device: 'Drawn signature on a touchscreen device',
+  approved: 'Approved',
+  reviewed: 'Reviewed',
+  other: 'Other',
+  authored_by_me: 'Authored by me',
+  invite: 'Invite',
+  email: 'Email',
+  approved_by: 'Approved by',
+  reviewed_by: 'Reviewed by',
+  authored_by: 'Authored by',
+  select_a_reason: 'Select a reason',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scan the QR code with the camera app to open the form on mobile and draw your signature',
   date: 'Date',
   number: 'Number',
+  value_is_invalid: 'Value is invalid',
+  verification_code_is_invalid: 'Verification code is invalid',
   already_paid: 'Already paid',
   image: 'Image',
   pay: 'Pay',
   take_photo: 'Take photo',
   number_phone_is_invalid: '{number} phone is invalid',
   file: 'File',
+  digitally_signed_by: 'Digitally signed by',
+  reason: 'Reason',
   select: 'Select',
   checkbox: 'Checkbox',
   multiple: 'Multiple',
@@ -24,7 +40,8 @@ const en = {
   minimize: 'Minimize',
   payment: 'Payment',
   phone: 'Phone',
-  submit_form: 'Submit Form',
+  start_now: 'Start Now',
+  continue: 'Continue',
   sign_now: 'Sign Now',
   type_here_: 'Type here...',
   optional: 'optional',
@@ -45,8 +62,10 @@ const en = {
   type_signature_here: 'Type signature here',
   type_initial_here: 'Type initials here',
   form_has_been_completed: 'Form has been completed!',
+  document_has_been_signed: 'Document has been signed!',
+  documents_have_been_signed: 'Documents have been signed!',
   create_a_free_account: 'Create a Free Account',
-  signed_with: 'Signed with',
+  powered_by: 'Powered by',
   please_check_the_box_to_continue: 'Please check the box to continue',
   open_source_documents_software: 'open source documents software',
   verified_phone_number: 'Verify Phone Number',
@@ -73,6 +92,20 @@ const en = {
 }
 
 const es = {
+  complete: 'Completar',
+  sign_and_complete: 'Firmar y Completar',
+  invite: 'Invitar',
+  email: 'Correo electrónico',
+  approved: 'Aprobado',
+  reviewed: 'Revisado',
+  other: 'Otro',
+  authored_by_me: 'Escrito por mí',
+  approved_by: 'Aprobado por',
+  reviewed_by: 'Revisado por',
+  authored_by: 'Escrito por',
+  select_a_reason: 'Selecciona una razón',
+  value_is_invalid: 'El valor no es válido',
+  verification_code_is_invalid: 'El código de verificación no es válido',
   drawn_signature_on_a_touchscreen_device: 'Firma dibujada en un dispositivo con pantalla táctil',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Escanea el código QR con la aplicación de la cámara para abrir el formulario en el móvil y dibujar tu firma',
   by_clicking_you_agree_to_the: 'Al hacer clic en "{button}", usted acepta el',
@@ -83,6 +116,8 @@ const es = {
   text: 'Texto',
   signature: 'Firma',
   pay: 'Pagar',
+  digitally_signed_by: 'Firmado digitalmente por',
+  reason: 'Razón',
   initials: 'Iniciales',
   date: 'Fecha',
   number: 'Número',
@@ -98,7 +133,8 @@ const es = {
   payment: 'Pago',
   phone: 'Teléfono',
   take_photo: 'Tomar foto',
-  submit_form: 'Enviar Formulario',
+  start_now: 'Comenzar ahora',
+  continue: 'Continuar',
   sign_now: 'Firmar ahora',
   type_here_: 'Escribe aquí...',
   optional: 'opcional',
@@ -118,8 +154,10 @@ const es = {
   type_signature_here: 'Escribe la firma aquí',
   type_initial_here: 'Escribe las iniciales aquí',
   form_has_been_completed: '¡El formulario ha sido completado!',
+  document_has_been_signed: '¡El documento ha sido firmado!',
+  documents_have_been_signed: '¡Los documentos han sido firmados!',
   create_a_free_account: 'Crear una Cuenta Gratuita',
-  signed_with: 'Firmado con',
+  powered_by: 'Desarrollado por',
   please_check_the_box_to_continue: 'Por favor marque la casilla para continuar',
   open_source_documents_software: 'software de documentos de código abierto',
   verified_phone_number: 'Verificar número de teléfono',
@@ -146,6 +184,20 @@ const es = {
 }
 
 const it = {
+  complete: 'Completa',
+  sign_and_complete: 'Firma e Completa',
+  invite: 'Invita',
+  email: 'Email',
+  approved: 'Approvato',
+  reviewed: 'Revisionato',
+  other: 'Altro',
+  authored_by_me: 'Creato da me',
+  approved_by: 'Approvato da',
+  reviewed_by: 'Revisionato da',
+  authored_by: 'Creato da',
+  select_a_reason: 'Seleziona una ragione',
+  value_is_invalid: 'Il valore non è valido',
+  verification_code_is_invalid: 'Il codice di verifica non è valido',
   drawn_signature_on_a_touchscreen_device: 'Firma disegnata su un dispositivo con schermo tattile',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scansiona il codice QR con l\'app della fotocamera per aprire il modulo sul cellulare e disegnare la tua firma',
   by_clicking_you_agree_to_the: 'Cliccando su "{button}", accetti il',
@@ -155,6 +207,8 @@ const it = {
   already_paid: 'Pagato',
   text: 'Testo',
   signature: 'Firma',
+  digitally_signed_by: 'Firmato digitalmente da',
+  reason: 'Motivo',
   initials: 'Iniziali',
   date: 'Data',
   number: 'Numero',
@@ -170,7 +224,8 @@ const it = {
   payment: 'Pagamento',
   number_phone_is_invalid: '{number} telefono non è valido',
   phone: 'Telefono',
-  submit_form: 'Invia Modulo',
+  start_now: 'Inizia ora',
+  continue: 'Continua',
   sign_now: 'Firma ora',
   type_here_: 'Digita qui...',
   optional: 'opzionale',
@@ -191,8 +246,10 @@ const it = {
   type_signature_here: 'Scrivi la firma qui',
   type_initial_here: 'Scrivi le iniziali qui',
   form_has_been_completed: 'Il modulo è stato completato!',
+  document_has_been_signed: 'Il documento è stato firmato!',
+  documents_have_been_signed: 'I documenti sono stati firmati!',
   create_a_free_account: 'Crea un Account Gratuito',
-  signed_with: 'Firmato con',
+  powered_by: 'Desarrollado por',
   please_check_the_box_to_continue: 'Si prega di spuntare la casella per continuare',
   open_source_documents_software: 'software di documenti open source',
   verified_phone_number: 'Verifica numero di telefono',
@@ -219,6 +276,20 @@ const it = {
 }
 
 const de = {
+  complete: 'Abschließen',
+  sign_and_complete: 'Signieren und Abschließen',
+  invite: 'Einladen',
+  email: 'E-Mail',
+  approved: 'Genehmigt',
+  reviewed: 'Überprüft',
+  other: 'Andere',
+  authored_by_me: 'Von mir verfasst',
+  approved_by: 'Genehmigt von',
+  reviewed_by: 'Überprüft von',
+  authored_by: 'Verfasst von',
+  select_a_reason: 'Grund auswählen',
+  value_is_invalid: 'Wert ist ungültig',
+  verification_code_is_invalid: 'Bestätigungscode ist ungültig',
   drawn_signature_on_a_touchscreen_device: 'Gezeichnete Unterschrift auf einem Touchscreen-Gerät',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scannen Sie den QR-Code mit der Kamera-App, um das Formular auf dem Handy zu öffnen und Ihre Unterschrift zu zeichnen',
   by_clicking_you_agree_to_the: 'Durch Klicken auf "{button}" stimmen Sie zu, dass Sie die',
@@ -228,6 +299,8 @@ const de = {
   minimize: 'Minimieren',
   text: 'Text',
   signature: 'Unterschrift',
+  digitally_signed_by: 'Digital unterschrieben von',
+  reason: 'Grund',
   initials: 'Initialen',
   date: 'Datum',
   number: 'Nummer',
@@ -243,7 +316,8 @@ const de = {
   payment: 'Zahlung',
   number_phone_is_invalid: '{number} Telefonnummer ist ungültig',
   phone: 'Telefon',
-  submit_form: 'Formular absenden',
+  start_now: 'Jetzt starten',
+  continue: 'Fortsetzen',
   sign_now: 'Jetzt unterschreiben',
   type_here_: 'Hier eingeben...',
   optional: 'optional',
@@ -264,8 +338,10 @@ const de = {
   type_signature_here: 'Unterschrift hier eingeben',
   type_initial_here: 'Initialen hier eingeben',
   form_has_been_completed: 'Formular wurde ausgefüllt!',
+  document_has_been_signed: 'Dokument wurde unterschrieben!',
+  documents_have_been_signed: 'Dokumente wurden unterschrieben!',
   create_a_free_account: 'Kostenloses Konto erstellen',
-  signed_with: 'Unterschrieben mit',
+  powered_by: 'Bereitgestellt von',
   please_check_the_box_to_continue: 'Bitte setzen Sie das Häkchen, um fortzufahren',
   open_source_documents_software: 'Open-Source-Dokumentensoftware',
   verified_phone_number: 'Telefonnummer überprüfen',
@@ -292,6 +368,20 @@ const de = {
 }
 
 const fr = {
+  complete: 'Terminer',
+  sign_and_complete: 'Signer et Terminer',
+  invite: 'Inviter',
+  email: 'Courriel',
+  approved: 'Approuvé',
+  reviewed: 'Révisé',
+  other: 'Autre',
+  authored_by_me: 'Rédigé par moi',
+  approved_by: 'Approuvé par',
+  reviewed_by: 'Révisé par',
+  authored_by: 'Rédigé par',
+  select_a_reason: 'Sélectionnez une raison',
+  value_is_invalid: 'La valeur est invalide',
+  verification_code_is_invalid: 'Le code de vérification est invalide',
   drawn_signature_on_a_touchscreen_device: 'Signature dessinée sur un appareil à écran tactile',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scannez le code QR avec l\'application de l\'appareil photo pour ouvrir le formulaire sur mobile et dessiner votre signature',
   by_clicking_you_agree_to_the: 'En cliquant sur "{button}", vous acceptez la',
@@ -302,6 +392,8 @@ const fr = {
   already_paid: 'Déjà payé',
   signature: 'Signature',
   initials: 'Initiales',
+  digitally_signed_by: 'Signé numériquement par',
+  reason: 'Raison',
   pay: 'Payer',
   date: 'Date',
   number: 'Numéro',
@@ -316,7 +408,8 @@ const fr = {
   payment: 'Paiement',
   number_phone_is_invalid: '{number} téléphone est invalide',
   phone: 'Téléphone',
-  submit_form: 'Envoyer le Formulaire',
+  start_now: 'Commencer maintenant',
+  continue: 'Continuer',
   sign_now: 'Signer maintenant',
   type_here_: 'Tapez ici...',
   optional: 'facultatif',
@@ -337,8 +430,10 @@ const fr = {
   type_signature_here: 'Tapez la signature ici',
   type_initial_here: 'Tapez les initiales ici',
   form_has_been_completed: 'Le formulaire a été complété !',
+  document_has_been_signed: 'Le document a été signé!',
+  documents_have_been_signed: 'Les documents ont été signés!',
   create_a_free_account: 'Créer un Compte Gratuit',
-  signed_with: 'Signé avec',
+  powered_by: 'Propulsé par',
   please_check_the_box_to_continue: 'Veuillez cocher la case pour continuer',
   open_source_documents_software: 'logiciel de documents open source',
   verified_phone_number: 'Vérifier le numéro de téléphone',
@@ -365,6 +460,20 @@ const fr = {
 }
 
 const pl = {
+  complete: 'Zakończ',
+  sign_and_complete: 'Podpisz i zakończ',
+  invite: 'Zaproś',
+  email: 'E-mail',
+  approved: 'Zaakceptowany',
+  reviewed: 'Przejrzany',
+  other: 'Inny',
+  authored_by_me: 'Napisane przeze mnie',
+  approved_by: 'Zaakceptowany przez',
+  reviewed_by: 'Przejrzany przez',
+  authored_by: 'Napisane przez',
+  select_a_reason: 'Wybierz powód',
+  value_is_invalid: 'Wartość jest nieprawidłowa',
+  verification_code_is_invalid: 'Kod weryfikacyjny jest nieprawidłowy',
   drawn_signature_on_a_touchscreen_device: 'Podpis odręczny na urządzeniu z ekranem dotykowym',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Zeskanuj kod QR za pomocą aplikacji aparatu, aby otworzyć formularz na telefonie i narysować swój podpis',
   by_clicking_you_agree_to_the: 'Klikając na "{button}", zgadzasz się na',
@@ -373,6 +482,8 @@ const pl = {
   minimize: 'Zminimalizuj',
   text: 'Tekst',
   already_paid: 'Już zapłacono',
+  digitally_signed_by: 'Podpisano cyfrowo przez',
+  reason: 'Powód',
   signature: 'Podpis',
   initials: 'Inicjały',
   date: 'Data',
@@ -389,7 +500,8 @@ const pl = {
   payment: 'Płatność',
   number_phone_is_invalid: '{number} telefon jest nieprawidłowy',
   phone: 'Telefon',
-  submit_form: 'Wyślij Formularz',
+  start_now: 'Zacznij teraz',
+  continue: 'Kontynuuj',
   sign_now: 'Podpisz teraz',
   type_here_: 'Wpisz tutaj...',
   optional: 'opcjonalny',
@@ -410,8 +522,10 @@ const pl = {
   type_signature_here: 'Wpisz podpis tutaj',
   type_initial_here: 'Wpisz inicjały tutaj',
   form_has_been_completed: 'Formularz został wypełniony!',
+  document_has_been_signed: 'Dokument został podpisany!',
+  documents_have_been_signed: 'Dokumenty zostały podpisane!',
   create_a_free_account: 'Utwórz darmowe konto',
-  signed_with: 'Podpisane za pomocą',
+  powered_by: 'Napędzany przez',
   please_check_the_box_to_continue: 'Proszę zaznaczyć pole, aby kontynuować',
   open_source_documents_software: 'oprogramowanie do dokumentów open source',
   verified_phone_number: 'Zweryfikuj numer telefonu',
@@ -438,6 +552,20 @@ const pl = {
 }
 
 const uk = {
+  complete: 'Завершити',
+  sign_and_complete: 'Підписати і завершити',
+  invite: 'Запросити',
+  email: 'Електронна пошта',
+  approved: 'Затверджено',
+  reviewed: 'Переглянуто',
+  other: 'Інше',
+  authored_by_me: 'Авторство моє',
+  approved_by: 'Затверджено',
+  reviewed_by: 'Переглянуто',
+  authored_by: 'Автор',
+  select_a_reason: 'Виберіть причину',
+  value_is_invalid: 'Значення є неправильним',
+  verification_code_is_invalid: 'Код підтвердження є неправильним',
   drawn_signature_on_a_touchscreen_device: 'Підпис на сенсорному пристрої',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Скануйте QR-код за допомогою програми камери, щоб відкрити форму на мобільному пристрої та намалювати свій підпис',
   by_clicking_you_agree_to_the: 'Натиснувши на "{button}", ви погоджуєтеся з',
@@ -447,6 +575,8 @@ const uk = {
   text: 'Текст',
   already_paid: 'Вже оплачено',
   signature: 'Підпис',
+  digitally_signed_by: 'Підписано в електронному вигляді',
+  reason: 'Причина',
   initials: 'Ініціали',
   date: 'Дата',
   number: 'Число',
@@ -462,7 +592,8 @@ const uk = {
   payment: 'Платіж',
   number_phone_is_invalid: '{number} телефон недійсний',
   phone: 'Телефон',
-  submit_form: 'Надіслати Форму',
+  start_now: 'Почати зараз',
+  continue: 'Продовжити',
   sign_now: 'Підписати зараз',
   type_here_: 'Введіть тут',
   optional: 'необов’язково',
@@ -483,8 +614,10 @@ const uk = {
   type_signature_here: 'Введіть підпис тут',
   type_initial_here: 'Введіть ініціали тут',
   form_has_been_completed: 'Форму заповнено!',
+  document_has_been_signed: 'Документ був підписаний!',
+  documents_have_been_signed: 'Документи були підписані!',
   create_a_free_account: 'Створити безкоштовний обліковий запис',
-  signed_with: 'Підписано за допомогою',
+  powered_by: 'Працює на базі',
   please_check_the_box_to_continue: 'Будь ласка, позначте прапорець, щоб продовжити',
   open_source_documents_software: 'відкритий програмний засіб для документів',
   verified_phone_number: 'Підтвердіть номер телефону',
@@ -511,6 +644,20 @@ const uk = {
 }
 
 const cs = {
+  complete: 'Dokončit',
+  sign_and_complete: 'Podepsat a dokončit',
+  invite: 'Pozvat',
+  email: 'E-mail',
+  approved: 'Schváleno',
+  reviewed: 'Zkontrolováno',
+  other: 'Jiné',
+  authored_by_me: 'Autorem jsem já',
+  approved_by: 'Schváleno kým',
+  reviewed_by: 'Zkontrolováno kým',
+  authored_by: 'Autorem',
+  select_a_reason: 'Vyberte důvod',
+  value_is_invalid: 'Hodnota je neplatná',
+  verification_code_is_invalid: 'Ověřovací kód je neplatný',
   drawn_signature_on_a_touchscreen_device: 'Namalovaný podpis na dotykovém zařízení',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Naskenujte QR kód pomocí aplikace fotoaparátu, abyste otevřeli formulář na mobilním zařízení a nakreslili svůj podpis',
   by_clicking_you_agree_to_the: 'Kliknutím na "{button}" souhlasíte s',
@@ -523,6 +670,8 @@ const cs = {
   initials: 'Iniciály',
   date: 'Datum',
   number: 'Číslo',
+  digitally_signed_by: 'Digitálně podepsáno',
+  reason: 'Důvod',
   image: 'Obrázek',
   pay: 'Zaplatit',
   file: 'Soubor',
@@ -535,7 +684,8 @@ const cs = {
   payment: 'Platba',
   phone: 'Telefon',
   number_phone_is_invalid: '{number} telefon je neplatný',
-  submit_form: 'Odeslat formulář',
+  start_now: 'Začít nyní',
+  continue: 'Pokračovat',
   sign_now: 'Podepsat nyní',
   type_here_: 'Zadejte zde',
   optional: 'volitelné',
@@ -556,8 +706,10 @@ const cs = {
   type_signature_here: 'Sem zadejte podpis',
   type_initial_here: 'Sem zadejte iniciály',
   form_has_been_completed: 'Formulář byl dokončen!',
+  document_has_been_signed: 'Dokument byl podepsán!',
+  documents_have_been_signed: 'Dokumenty byly podepsány!',
   create_a_free_account: 'Vytvořit bezplatný účet',
-  signed_with: 'Podepsáno pomocí',
+  powered_by: 'Poháněno',
   please_check_the_box_to_continue: 'Prosím, zaškrtněte políčko pro pokračování',
   open_source_documents_software: 'open source software pro dokumenty',
   verified_phone_number: 'Ověřte telefonní číslo',
@@ -584,6 +736,20 @@ const cs = {
 }
 
 const pt = {
+  complete: 'Completar',
+  sign_and_complete: 'Assinar e Completar',
+  invite: 'Convidar',
+  email: 'E-mail',
+  approved: 'Aprovado',
+  reviewed: 'Revisado',
+  other: 'Outro',
+  authored_by_me: 'Autorizado por mim',
+  approved_by: 'Aprovado por',
+  reviewed_by: 'Revisado por',
+  authored_by: 'Autorizado por',
+  select_a_reason: 'Selecione um motivo',
+  value_is_invalid: 'Valor é inválido',
+  verification_code_is_invalid: 'Código de verificação é inválido',
   drawn_signature_on_a_touchscreen_device: 'Assinatura desenhada em um dispositivo com tela sensível ao toque',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Escaneie o código QR com o aplicativo da câmera para abrir o formulário no celular e desenhar sua assinatura',
   by_clicking_you_agree_to_the: 'Ao clicar em "{button}", você concorda com o',
@@ -594,6 +760,8 @@ const pt = {
   text: 'Texto',
   signature: 'Assinatura',
   initials: 'Iniciais',
+  digitally_signed_by: 'Assinado digitalmente por',
+  reason: 'Razão',
   date: 'Data',
   number: 'Número',
   image: 'Imagem',
@@ -608,7 +776,8 @@ const pt = {
   payment: 'Pagamento',
   number_phone_is_invalid: '{number} telefone é inválido',
   phone: 'Telefone',
-  submit_form: 'Enviar Formulário',
+  start_now: 'Começar agora',
+  continue: 'Continuar',
   sign_now: 'Assinar agora',
   type_here_: 'Digite aqui',
   optional: 'opcional',
@@ -629,8 +798,10 @@ const pt = {
   type_signature_here: 'Digite a assinatura aqui',
   type_initial_here: 'Digite as iniciais aqui',
   form_has_been_completed: 'O formulário foi concluído!',
+  document_has_been_signed: 'O documento foi assinado!',
+  documents_have_been_signed: 'Os documentos foram assinados!',
   create_a_free_account: 'Criar uma Conta Gratuita',
-  signed_with: 'Assinado com',
+  powered_by: 'Desenvolvido por',
   please_check_the_box_to_continue: 'Por favor, marque a caixa para continuar',
   open_source_documents_software: 'software de documentos de código aberto',
   verified_phone_number: 'Verificar Número de Telefone',
@@ -657,6 +828,20 @@ const pt = {
 }
 
 const he = {
+  complete: 'השלם',
+  sign_and_complete: 'חתום והשלם',
+  invite: 'הזמן',
+  email: 'דוא"ל',
+  approved: 'מאושר',
+  reviewed: 'נסקר',
+  other: 'אחר',
+  authored_by_me: 'נכתב על ידי',
+  approved_by: 'אושר על ידי',
+  reviewed_by: 'נסקר על ידי',
+  authored_by: 'נכתב על ידי',
+  select_a_reason: 'בחר סיבה',
+  value_is_invalid: 'ערך לא תקין',
+  verification_code_is_invalid: 'קוד האימות אינו תקין',
   drawn_signature_on_a_touchscreen_device: 'חתימה שנוצרה במכשיר עם מסך מגע',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'סרוק את קוד ה-QR באמצעות אפליקציית המצלמה כדי לפתוח את הטופס במובייל ולצייר את החתימה שלך',
   by_clicking_you_agree_to_the: 'על ידי לחיצה על "{button}", אתה מסכים ל',
@@ -668,6 +853,8 @@ const he = {
   signature: 'חתימה',
   initials: 'ראשי תיבות',
   date: 'תאריך',
+  digitally_signed_by: 'חתום דיגיטלית על ידי',
+  reason: 'סיבה',
   number: 'מספר',
   image: 'תמונה',
   file: 'קובץ',
@@ -681,7 +868,8 @@ const he = {
   payment: 'תשלום',
   phone: 'טלפון',
   number_phone_is_invalid: '{number} טלפון אינו חוקי',
-  submit_form: 'שלח טופס',
+  start_now: 'התחל עכשיו',
+  continue: 'המשך',
   sign_now: 'חתום כעת',
   type_here_: 'הקלד כאן',
   optional: 'אופציונלי',
@@ -703,8 +891,10 @@ const he = {
   type_signature_here: 'הקלד חתימה כאן',
   type_initial_here: 'הקלד ציוני ראשי תיבות כאן',
   form_has_been_completed: 'הטופס הושלם',
+  document_has_been_signed: 'המסמך נחתם!',
+  documents_have_been_signed: 'המסמכים נחתמו!',
   create_a_free_account: 'צור חשבון חינם',
-  signed_with: 'חתום באמצעות',
+  powered_by: 'מופעל על ידי',
   please_check_the_box_to_continue: 'אנא סמן את התיבה כדי להמשיך',
   open_source_documents_software: 'תוכנה פתוחה למסמכים',
   verified_phone_number: 'אימות מספר טלפון',
@@ -731,6 +921,20 @@ const he = {
 }
 
 const nl = {
+  complete: 'Voltooien',
+  sign_and_complete: 'Ondertekenen en voltooien',
+  invite: 'Uitnodigen',
+  email: 'E-mail',
+  approved: 'Goedgekeurd',
+  reviewed: 'Beoordeeld',
+  other: 'Anders',
+  authored_by_me: 'Door mij geschreven',
+  approved_by: 'Goedgekeurd door',
+  reviewed_by: 'Beoordeeld door',
+  authored_by: 'Geschreven door',
+  select_a_reason: 'Selecteer een reden',
+  value_is_invalid: 'Waarde is ongeldig',
+  verification_code_is_invalid: 'Verificatiecode is ongeldig',
   drawn_signature_on_a_touchscreen_device: 'Getekende handtekening op een apparaat met een touchscreen',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scan de QR-code met de camera-app om het formulier op mobiel te openen en uw handtekening te tekenen',
   by_clicking_you_agree_to_the: 'Door op "{button}" te klikken, gaat u akkoord met de',
@@ -740,6 +944,8 @@ const nl = {
   text: 'Tekst',
   already_paid: 'Al betaald',
   signature: 'Handtekening',
+  digitally_signed_by: 'Digitaal ondertekend door',
+  reason: 'Reden',
   initials: 'Initialen',
   date: 'Datum',
   number: 'Nummer',
@@ -756,7 +962,8 @@ const nl = {
   payment: 'Betaling',
   phone: 'Telefoon',
   number_phone_is_invalid: '{number} telefoon is ongeldig',
-  submit_form: 'Formulier verzenden',
+  start_now: 'Nu beginnen',
+  continue: 'Doorgaan',
   sign_now: 'Nu ondertekenen',
   type_here_: 'Typ hier...',
   optional: 'Optioneel',
@@ -777,8 +984,10 @@ const nl = {
   type_signature_here: 'Typ hier uw handtekening',
   type_initial_here: 'Typ hier uw initialen',
   form_has_been_completed: 'Formulier is voltooid!',
+  document_has_been_signed: 'Document is ondertekend!',
+  documents_have_been_signed: 'De documenten zijn ondertekend!',
   create_a_free_account: 'Maak een gratis account aan',
-  signed_with: 'Ondertekend met',
+  powered_by: 'Aangedreven door',
   please_check_the_box_to_continue: 'Vink het vakje aan om door te gaan',
   open_source_documents_software: 'Open source documenten software',
   verified_phone_number: 'Geverifieerd telefoonnummer',
@@ -805,6 +1014,20 @@ const nl = {
 }
 
 const ar = {
+  complete: 'اكتمال',
+  sign_and_complete: 'التوقيع والاكتمال',
+  invite: 'دعوة',
+  email: 'البريد الإلكتروني',
+  approved: 'موافق عليه',
+  reviewed: 'تمت مراجعته',
+  other: 'آخر',
+  authored_by_me: 'مؤلف بواسطتي',
+  approved_by: 'موافق عليه من قبل',
+  reviewed_by: 'مراجع من قبل',
+  authored_by: 'مؤلف من قبل',
+  select_a_reason: 'اختر سببًا',
+  value_is_invalid: 'القيمة غير صالحة',
+  verification_code_is_invalid: 'رمز التحقق غير صالح',
   drawn_signature_on_a_touchscreen_device: 'توقيع مرسوم على جهاز بشاشة تعمل باللمس',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'امسح رمز الاستجابة السريعة باستخدام تطبيق الكاميرا لفتح النموذج على الهاتف المحمول ورسم توقيعك',
   by_clicking_you_agree_to_the: 'بالنقر فوق "{button}"، أنت توافق على',
@@ -815,6 +1038,8 @@ const ar = {
   initials: 'الاختصارات',
   date: 'تاريخ',
   number: 'رقم',
+  digitally_signed_by: 'تم التوقيع رقميًا بواسطة',
+  reason: 'السبب',
   image: 'صورة',
   take_photo: 'التقاط صورة',
   pay: 'دفع',
@@ -829,7 +1054,8 @@ const ar = {
   payment: 'الدفع',
   phone: 'هاتف',
   number_phone_is_invalid: '{number} هاتف غير صالح',
-  submit_form: 'إرسال النموذج',
+  start_now: 'ابدأ الآن',
+  continue: 'متابعة',
   sign_now: 'وقع الآن',
   type_here_: 'اكتب هنا',
   optional: 'اختياري',
@@ -850,8 +1076,10 @@ const ar = {
   type_signature_here: 'اكتب التوقيع هنا',
   type_initial_here: 'اكتب الاختصارات هنا',
   form_has_been_completed: 'تم إكمال النموذج!',
+  document_has_been_signed: 'تم توقيع الوثيقة!',
+  documents_have_been_signed: 'تم توقيع الوثائق!',
   create_a_free_account: 'إنشاء حساب مجاني',
-  signed_with: 'تم التوقيع بواسطة',
+  powered_by: 'مدعوم من',
   please_check_the_box_to_continue: 'الرجاء التحقق من الخانة للمتابعة',
   open_source_documents_software: 'برنامج وثائق مفتوح المصدر',
   verified_phone_number: 'تحقق من رقم الهاتف',
@@ -878,6 +1106,18 @@ const ar = {
 }
 
 const ko = {
+  complete: '완료',
+  sign_and_complete: '서명하고 완료하기',
+  invite: '초대하기',
+  email: '이메일',
+  approved: '승인됨',
+  reviewed: '검토됨',
+  other: '기타',
+  authored_by_me: '내가 작성한',
+  approved_by: '승인자',
+  reviewed_by: '검토자',
+  authored_by: '작성자',
+  select_a_reason: '이유 선택',
   drawn_signature_on_a_touchscreen_device: '터치스크린 장치에서 그린 서명',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: '카메라 앱으로 QR 코드를 스캔하여 모바일에서 양식을 열고 서명을 그리세요',
   by_clicking_you_agree_to_the: '"{button}"를 클릭함으로써, 다음에 동의하게 됩니다',
@@ -888,6 +1128,8 @@ const ko = {
   signature: '서명',
   initials: '이니셜',
   date: '날짜',
+  digitally_signed_by: '디지털 서명이 완료되었습니다',
+  reason: '이유',
   number: '숫자',
   pay: '급여',
   image: '이미지',
@@ -903,7 +1145,8 @@ const ko = {
   payment: '결제',
   phone: '전화',
   number_phone_is_invalid: '{number} 전화번호가 유효하지 않습니다',
-  submit_form: '양식 제출',
+  start_now: '지금 시작하기',
+  continue: '계속하다',
   sign_now: '지금 서명',
   type_here_: '여기에 입력...',
   optional: '선택 사항',
@@ -924,8 +1167,10 @@ const ko = {
   type_signature_here: '여기에 서명 입력',
   type_initial_here: '여기에 이니셜 입력',
   form_has_been_completed: '양식이 완료되었습니다!',
+  document_has_been_signed: '문서가 서명되었습니다!',
+  documents_have_been_signed: '문서가 서명되었습니다!',
   create_a_free_account: '무료 계정 생성',
-  signed_with: '다음으로 서명:',
+  powered_by: '구동',
   please_check_the_box_to_continue: '계속하려면 확인란을 선택하십시오',
   open_source_documents_software: '오픈 소스 문서 소프트웨어',
   verified_phone_number: '전화번호 확인됨',

app/javascript/submission_form/initials_step.vue

@@ -50,6 +50,26 @@
             </span>
           </a>
         </span>
+        <span
+          class="tooltip"
+          :data-tip="t('click_to_upload')"
+        >
+          <label
+            class="btn btn-outline btn-sm font-medium inline-flex flex-nowrap"
+          >
+            <IconUpload :width="16" />
+            <input
+              :key="uploadImageInputKey"
+              type="file"
+              hidden
+              accept="image/*"
+              @change="drawImage"
+            >
+            <span class="hidden sm:inline">
+              {{ t('upload') }}
+            </span>
+          </label>
+        </span>
         <a
           v-if="modelValue || computedPreviousValue"
           href="#"
@@ -97,7 +117,7 @@
     <img
       v-if="modelValue || computedPreviousValue"
       :src="attachmentsIndex[modelValue || computedPreviousValue].url"
-      class="mx-auto bg-white border border-base-300 rounded max-h-72"
+      class="mx-auto bg-white border border-base-300 rounded max-h-44"
     >
     <canvas
       v-show="!modelValue && !computedPreviousValue"
@@ -120,16 +140,18 @@
 
 <script>
 import { cropCanvasAndExportToPNG } from './crop_canvas'
-import { IconReload, IconTextSize, IconSignature, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
+import { IconReload, IconTextSize, IconUpload, IconSignature, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
 import SignaturePad from 'signature_pad'
 import AppearsOn from './appears_on'
 import MarkdownContent from './markdown_content'
+import SignatureStep from './signature_step'
 
 const scale = 3
 
 export default {
   name: 'InitialsStep',
   components: {
+    IconUpload,
     AppearsOn,
     IconReload,
     IconTextSize,
@@ -178,7 +200,8 @@ export default {
     return {
       isInitialsStarted: !!this.previousValue,
       isUsePreviousValue: true,
-      isDrawInitials: false
+      isDrawInitials: false,
+      uploadImageInputKey: Math.random().toString()
     }
   },
   computed: {
@@ -229,6 +252,15 @@ export default {
     this.intersectionObserver?.disconnect()
   },
   methods: {
+    drawOnCanvas: SignatureStep.methods.drawOnCanvas,
+    drawImage (event) {
+      this.remove()
+      this.isInitialsStarted = true
+
+      this.drawOnCanvas(event.target.files[0], this.$refs.canvas)
+
+      this.uploadImageInputKey = Math.random().toString()
+    },
     remove () {
       this.$emit('update:model-value', '')
 

app/javascript/submission_form/invite_form.vue

@@ -0,0 +1,117 @@
+<template>
+  <form
+    ref="form"
+    action="post"
+    method="post"
+    class="mx-auto"
+    @submit.prevent="submit"
+  >
+    <input
+      type="hidden"
+      name="authenticity_token"
+      :value="authenticityToken"
+    >
+    <div
+      v-for="(submitter, index) in submitters"
+      :key="submitter.uuid"
+      :class="{ 'mt-4': index !== 0 }"
+    >
+      <input
+        :value="submitter.uuid"
+        hidden
+        name="submission[submitters][][uuid]"
+      >
+      <label
+        :for="submitter.uuid"
+        dir="auto"
+        class="label text-2xl"
+      >
+        {{ t('invite') }} {{ submitter.name }}
+      </label>
+      <input
+        :id="submitter.uuid"
+        dir="auto"
+        class="base-input !text-2xl w-full"
+        :placeholder="t('email')"
+        type="email"
+        required
+        autofocus="true"
+        name="submission[submitters][][email]"
+      >
+    </div>
+    <div
+      class="mt-6 md:mt-8"
+    >
+      <button
+        type="submit"
+        class="base-button w-full flex justify-center"
+        :disabled="isSubmitting"
+      >
+        <span class="flex">
+          <IconInnerShadowTop
+            v-if="isSubmitting"
+            class="mr-1 animate-spin"
+          />
+          <span>
+            {{ t('submit') }}
+          </span><span
+            v-if="isSubmitting"
+            class="w-6 flex justify-start mr-1"
+          ><span>...</span></span>
+        </span>
+      </button>
+    </div>
+  </form>
+</template>
+
+<script>
+import { IconInnerShadowTop } from '@tabler/icons-vue'
+
+export default {
+  name: 'InviteForm',
+  components: {
+    IconInnerShadowTop
+  },
+  inject: ['t'],
+  props: {
+    submitters: {
+      type: Array,
+      required: true
+    },
+    url: {
+      type: String,
+      required: true
+    },
+    authenticityToken: {
+      type: String,
+      required: true
+    },
+    submitterSlug: {
+      type: String,
+      required: true
+    }
+  },
+  emits: ['success'],
+  data () {
+    return {
+      isSubmitting: false
+    }
+  },
+  methods: {
+    submit () {
+      this.isSubmitting = true
+
+      return fetch(this.url, {
+        method: 'POST',
+        body: new FormData(this.$refs.form)
+      }).then((response) => {
+        if (response.status === 200) {
+          this.$emit('success')
+        }
+      }).finally(() => {
+        this.isSubmitting = false
+      })
+    }
+  }
+}
+</script>

app/javascript/submission_form/markdown_content.vue

@@ -51,7 +51,17 @@ export default {
   },
   computed: {
     items () {
-      return snarkdown(this.string.replace(/\n/g, '<br>')).split(htmlSplitRegexp)
+      const linkParts = this.string.split(/(https?:\/\/[^\s)]+)/g)
+
+      const text = linkParts.map((part, index) => {
+        if (part.match(/^https?:\/\//) && !linkParts[index - 1]?.match(/\(\s*$/) && !linkParts[index + 1]?.match(/^\s*\)/)) {
+          return `[${part}](${part})`
+        } else {
+          return part
+        }
+      }).join('')
+
+      return snarkdown(text.replace(/\n/g, '<br>')).split(htmlSplitRegexp)
     }
   },
   methods: {

app/javascript/submission_form/payment_step.vue

@@ -51,7 +51,7 @@
         class="btn bg-[#7B73FF] text-white hover:bg-[#0A2540] text-lg w-full"
         :class="{ disabled: isCreatingCheckout }"
         :disabled="isCreatingCheckout"
-        @click.prevent="startCheckout"
+        @click.prevent="postCheckout"
       >
         <IconInnerShadowTop
           v-if="isCreatingCheckout"
@@ -93,6 +93,10 @@ export default {
       type: Object,
       required: true
     },
+    values: {
+      type: Object,
+      required: true
+    },
     submitterSlug: {
       type: String,
       required: true
@@ -101,7 +105,8 @@ export default {
   emits: ['focus', 'submit', 'update:model-value', 'attached'],
   data () {
     return {
-      isCreatingCheckout: false
+      isCreatingCheckout: false,
+      isMathLoaded: false
     }
   },
   computed: {
@@ -114,20 +119,72 @@ export default {
     defaultName () {
       const { price, currency } = this.field.preferences || {}
 
-      const formattedPrice = new Intl.NumberFormat([], {
+      const formatter = new Intl.NumberFormat([], {
         style: 'currency',
         currency
-      }).format(price)
+      })
 
-      return this.t('pay') + ' ' + formattedPrice
+      if (this.field.preferences?.formula) {
+        if (this.isMathLoaded) {
+          return this.t('pay') + ' ' + formatter.format(this.calculateFormula())
+        } else {
+          return ''
+        }
+      } else {
+        return this.t('pay') + ' ' + formatter.format(price)
+      }
     }
   },
-  mounted () {
+  async mounted () {
     if (this.sessionId) {
       this.$emit('submit')
     }
+
+    if (!this.sessionId) {
+      this.postCheckout({ checkStatus: true })
+    }
+
+    if (this.field.preferences?.formula) {
+      const {
+        create,
+        evaluateDependencies,
+        addDependencies,
+        subtractDependencies,
+        divideDependencies,
+        multiplyDependencies,
+        powDependencies,
+        roundDependencies,
+        absDependencies,
+        sinDependencies,
+        tanDependencies,
+        cosDependencies
+      } = await import('mathjs')
+
+      this.math = create({
+        evaluateDependencies,
+        addDependencies,
+        subtractDependencies,
+        divideDependencies,
+        multiplyDependencies,
+        powDependencies,
+        roundDependencies,
+        absDependencies,
+        sinDependencies,
+        tanDependencies,
+        cosDependencies
+      })
+
+      this.isMathLoaded = true
+    }
   },
   methods: {
+    calculateFormula () {
+      const transformedFormula = this.field.preferences.formula.replace(/{{(.*?)}}/g, (match, uuid) => {
+        return this.values[uuid] || 0.0
+      })
+
+      return this.math.evaluate(transformedFormula.toLowerCase())
+    },
     async submit () {
       if (this.sessionId) {
         return fetch(this.baseUrl + '/api/stripe_payments/' + this.sessionId, {
@@ -158,7 +215,7 @@ export default {
         return Promise.resolve({})
       }
     },
-    startCheckout () {
+    postCheckout ({ checkStatus } = {}) {
       this.isCreatingCheckout = true
 
       fetch(this.baseUrl + '/api/stripe_payments', {
@@ -166,6 +223,7 @@ export default {
         body: JSON.stringify({
           submitter_slug: this.submitterSlug,
           field_uuid: this.field.uuid,
+          check_status: checkStatus,
           referer: document.location.href
         }),
         headers: { 'Content-Type': 'application/json' }

app/javascript/submission_form/signature_step.vue

@@ -156,7 +156,7 @@
         class="top-0 bottom-0 right-0 left-0 absolute bg-white rounded-2xl m-0.5"
       />
       <div
-        v-show="isShowQr"
+        v-if="isShowQr"
         class="top-0 bottom-0 right-0 left-0 absolute bg-base-content/10 rounded-2xl"
       >
         <div
@@ -172,13 +172,13 @@
         </div>
         <div class="flex items-center justify-center w-full h-full p-4">
           <div
-            v-if="withQrButton"
-            ref="qr"
             class="bg-white p-4 rounded-xl h-full"
           >
             <canvas
               ref="qrCanvas"
               class="h-full"
+              width="132"
+              height="132"
             />
           </div>
         </div>
@@ -194,6 +194,48 @@
       type="text"
       @input="updateWrittenSignature"
     >
+    <select
+      v-if="requireSigningReason && !isOtherReason"
+      class="select base-input !text-2xl w-full mt-6 text-center"
+      required
+      :name="`values[${field.preferences.reason_field_uuid}]`"
+      @change="$event.target.value === 'other' ? [reason = '', isOtherReason = true] : $emit('update:reason', $event.target.value)"
+    >
+      <option
+        value=""
+        disabled
+        :selected="!reason"
+      >
+        {{ t('select_a_reason') }}
+      </option>
+      <option
+        v-for="(label, option) in defaultReasons"
+        :key="option"
+        :value="option"
+        :selected="reason === option"
+      >
+        {{ label }}
+      </option>
+      <option value="other">
+        {{ t('other') }}
+      </option>
+    </select>
+    <input
+      v-if="requireSigningReason && isOtherReason"
+      class="base-input !text-2xl w-full mt-6"
+      required
+      :name="`values[${field.preferences.reason_field_uuid}]`"
+      :placeholder="t('type_here_')"
+      :value="reason"
+      type="text"
+      @input="$emit('update:reason', $event.target.value)"
+    >
+    <input
+      v-if="requireSigningReason"
+      hidden
+      name="with_reason"
+      :value="field.preferences.reason_field_uuid"
+    >
     <div
       v-if="isShowQr"
       dir="auto"
@@ -231,6 +273,7 @@ import { cropCanvasAndExportToPNG } from './crop_canvas'
 import SignaturePad from 'signature_pad'
 import AppearsOn from './appears_on'
 import MarkdownContent from './markdown_content'
+import { v4 } from 'uuid'
 
 let isFontLoaded = false
 
@@ -255,6 +298,11 @@ export default {
       type: Object,
       required: true
     },
+    requireSigningReason: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     submitter: {
       type: Object,
       required: true
@@ -304,17 +352,23 @@ export default {
       required: false,
       default: ''
     },
+    reason: {
+      type: String,
+      required: false,
+      default: ''
+    },
     modelValue: {
       type: String,
       required: false,
       default: ''
     }
   },
-  emits: ['attached', 'update:model-value', 'start', 'minimize'],
+  emits: ['attached', 'update:model-value', 'start', 'minimize', 'update:reason'],
   data () {
     return {
       isSignatureStarted: !!this.previousValue,
       isShowQr: false,
+      isOtherReason: false,
       isUsePreviousValue: true,
       isTextSignature: this.field.preferences?.format === 'typed',
       uploadImageInputKey: Math.random().toString()
@@ -324,6 +378,13 @@ export default {
     submitterSlug () {
       return this.submitter.slug
     },
+    defaultReasons () {
+      return {
+        [this.t('approved_by')]: this.t('approved'),
+        [this.t('reviewed_by')]: this.t('reviewed'),
+        [this.t('authored_by')]: this.t('authored_by_me')
+      }
+    },
     computedPreviousValue () {
       if (this.isUsePreviousValue) {
         return this.previousValue
@@ -332,6 +393,13 @@ export default {
       }
     }
   },
+  created () {
+    if (this.requireSigningReason) {
+      this.field.preferences ||= {}
+      this.field.preferences.reason_field_uuid ||= v4()
+      this.isOtherReason = this.reason && !this.defaultReasons[this.reason]
+    }
+  },
   async mounted () {
     this.$nextTick(() => {
       if (this.$refs.canvas) {
@@ -340,18 +408,6 @@ export default {
 
         this.$refs.canvas.getContext('2d').scale(scale, scale)
       }
-
-      if (this.withQrButton) {
-        import('qr-creator').then(({ default: Qr }) => {
-          Qr.render({
-            text: `${document.location.origin}/p/${this.submitterSlug}?f=${this.field.uuid.split('-')[0]}`,
-            radius: 0.0,
-            ecLevel: 'H',
-            background: null,
-            size: 132
-          }, this.$refs.qrCanvas)
-        })
-      }
     })
 
     if (this.$refs.canvas) {
@@ -406,6 +462,20 @@ export default {
     showQr () {
       this.isShowQr = true
 
+      this.$nextTick(() => {
+        import('qr-creator').then(({ default: Qr }) => {
+          if (this.$refs.qrCanvas) {
+            Qr.render({
+              text: `${document.location.origin}/p/${this.submitterSlug}?f=${this.field.uuid.split('-')[0]}`,
+              radius: 0.0,
+              ecLevel: 'H',
+              background: null,
+              size: 132
+            }, this.$refs.qrCanvas)
+          }
+        })
+      })
+
       this.startCheckSignature()
     },
     hideQr () {
@@ -499,8 +569,11 @@ export default {
       this.remove()
       this.isSignatureStarted = true
 
-      const file = event.target.files[0]
+      this.drawOnCanvas(event.target.files[0], this.$refs.canvas)
 
+      this.uploadImageInputKey = Math.random().toString()
+    },
+    drawOnCanvas (file, canvas) {
       if (file && file.type.match('image.*')) {
         const reader = new FileReader()
 
@@ -510,7 +583,6 @@ export default {
           img.src = event.target.result
 
           img.onload = () => {
-            const canvas = this.$refs.canvas
             const context = canvas.getContext('2d')
 
             const aspectRatio = img.width / img.height
@@ -545,8 +617,6 @@ export default {
         }
 
         reader.readAsDataURL(file)
-
-        this.uploadImageInputKey = Math.random().toString()
       }
     },
     maybeSetSignedUuid (signedUuid) {

app/javascript/submission_form/text_step.vue

@@ -147,7 +147,7 @@ export default {
       const textarea = this.$refs.textarea
 
       textarea.style.height = 'auto'
-      textarea.style.height = textarea.scrollHeight + 'px'
+      textarea.style.height = Math.min(250, textarea.scrollHeight) + 'px'
     },
     toggleTextArea () {
       this.isTextArea = true

app/javascript/template_builder/area.vue

@@ -9,7 +9,7 @@
     <div
       v-if="isSelected || isDraw"
       class="top-0 bottom-0 right-0 left-0 absolute border border-1.5 pointer-events-none"
-      :class="borderColors[submitterIndex]"
+      :class="field.type === 'heading' ? '' : borderColors[submitterIndex]"
     />
     <div
       v-if="field.type === 'cells' && (isSelected || isDraw)"
@@ -19,7 +19,7 @@
         v-for="(cellW, index) in cells"
         :key="index"
         class="absolute top-0 bottom-0 border-r"
-        :class="borderColors[submitterIndex]"
+        :class="field.type === 'heading' ? '' : borderColors[submitterIndex]"
         :style="{ left: (cellW / area.w * 100) + '%' }"
       >
         <span
@@ -31,14 +31,14 @@
       </div>
     </div>
     <div
-      v-if="field?.type"
+      v-if="field?.type && (isSelected || isNameFocus)"
-      class="absolute bg-white rounded-t border overflow-visible whitespace-nowrap group-hover:flex group-hover:z-10"
+      class="absolute bg-white rounded-t border overflow-visible whitespace-nowrap flex z-10"
-      :class="{ 'flex z-10': isNameFocus || isSelected, invisible: !isNameFocus && !isSelected }"
       style="top: -25px; height: 25px"
       @mousedown.stop
       @pointerdown.stop
     >
       <FieldSubmitter
+        v-if="field.type != 'heading'"
         v-model="field.submitter_uuid"
         class="border-r"
         :compact="true"
@@ -61,7 +61,7 @@
       <span
         v-if="field.type !== 'checkbox' || field.name"
         ref="name"
-        :contenteditable="editable && !defaultField"
+        :contenteditable="editable && !defaultField && field.type !== 'heading'"
         dir="auto"
         class="pr-1 cursor-text outline-none block"
         style="min-width: 2px"
@@ -71,11 +71,11 @@
         @blur="onNameBlur"
       >{{ optionIndexText }} {{ (defaultField ? (field.title || field.name) : field.name) || defaultName }}</span>
       <div
-        v-if="isSettingsFocus || isContenteditable || (isNameFocus && !['checkbox', 'phone'].includes(field.type))"
+        v-if="isSettingsFocus || (isValueInput && field.type !== 'heading') || (isNameFocus && !['checkbox', 'phone'].includes(field.type))"
         class="flex items-center ml-1.5"
       >
         <input
-          v-if="!isContenteditable"
+          v-if="!isValueInput"
           :id="`required-checkbox-${field.uuid}`"
           v-model="field.required"
           type="checkbox"
@@ -83,14 +83,14 @@
           @mousedown.prevent
         >
         <label
-          v-if="!isContenteditable"
+          v-if="!isValueInput"
           :for="`required-checkbox-${field.uuid}`"
           class="label text-xs"
           @click.prevent="field.required = !field.required"
           @mousedown.prevent
         >{{ t('required') }}</label>
         <input
-          v-if="isContenteditable"
+          v-if="isValueInput"
           :id="`readonly-checkbox-${field.uuid}`"
           type="checkbox"
           class="checkbox checkbox-xs no-animation rounded"
@@ -99,14 +99,14 @@
           @mousedown.prevent
         >
         <label
-          v-if="isContenteditable"
+          v-if="isValueInput"
           :for="`readonly-checkbox-${field.uuid}`"
           class="label text-xs"
           @click.prevent="field.readonly = !(field.readonly ?? true)"
           @mousedown.prevent
         >{{ t('editable') }}</label>
         <span
-          v-if="field.type !== 'payment' && !isContenteditable"
+          v-if="field.type !== 'payment' && !isValueInput"
           class="dropdown dropdown-end"
           @mouseenter="renderDropdown = true"
           @touchstart="renderDropdown = true"
@@ -157,18 +157,20 @@
       </button>
     </div>
     <div
+      ref="touchValueTarget"
       class="flex items-center h-full w-full"
       dir="auto"
-      :class="[isContenteditable ? 'bg-opacity-50' : 'bg-opacity-80', bgColors[submitterIndex], isDefaultValuePresent || isContenteditable ? (alignClasses[field.preferences?.align] || '') : 'justify-center']"
+      :class="[isValueInput ? 'bg-opacity-50' : 'bg-opacity-80', field.type === 'heading' ? 'bg-gray-50' : bgColors[submitterIndex], isDefaultValuePresent || isValueInput || (withFieldPlaceholder && field.areas) ? (alignClasses[field.preferences?.align] || '') : 'justify-center']"
+      @click="focusValueInput"
     >
       <span
         v-if="field"
-        class="flex justify-center items-center space-x-1 h-full"
+        class="flex justify-center items-center space-x-1"
-        :class="{ 'w-full h-full': ['cells', 'checkbox'].includes(field.type) }"
+        :class="{ 'w-full': ['cells', 'checkbox'].includes(field.type), 'h-full': !isValueInput }"
       >
         <div
-          v-if="isDefaultValuePresent || isContenteditable"
+          v-if="isDefaultValuePresent || isValueInput || (withFieldPlaceholder && field.areas && field.type !== 'checkbox')"
-          :class="{ 'w-full h-full': ['cells', 'checkbox'].includes(field.type), 'text-[1.5vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars }"
+          :class="{ 'w-full h-full': ['cells', 'checkbox'].includes(field.type), 'text-[1.6vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars }"
         >
           <div
             ref="textContainer"
@@ -181,7 +183,7 @@
               :class="{ '!w-auto !h-full': area.w > area.h, '!w-full !h-auto': area.w <= area.h }"
             />
             <span
-              v-else-if="field.type === 'number' && !isContenteditable"
+              v-else-if="field.type === 'number' && !isValueInput && (field.default_value || field.default_value == 0)"
               class="whitespace-pre-wrap"
             >{{ formatNumber(field.default_value, field.preferences?.format) }}</span>
             <span
@@ -205,13 +207,13 @@
             <span
               v-else
               ref="defaultValue"
-              :contenteditable="isContenteditable"
+              :contenteditable="isValueInput"
               class="whitespace-pre-wrap outline-none empty:before:content-[attr(placeholder)] before:text-gray-400"
-              :class="{ 'cursor-text': isContenteditable }"
+              :class="{ 'cursor-text': isValueInput }"
-              :placeholder="t('type_value')"
+              :placeholder="withFieldPlaceholder && !isValueInput ? field.name || defaultName : t('type_value')"
               @blur="onDefaultValueBlur"
               @paste.prevent="onPaste"
-              @keydown.enter.prevent="onDefaultValueEnter"
+              @keydown.enter="onDefaultValueEnter"
             >{{ field.default_value }}</span>
           </div>
         </div>
@@ -225,11 +227,12 @@
       </span>
     </div>
     <div
-      v-if="!isContenteditable"
+      v-if="!isValueInput"
       ref="touchTarget"
       class="absolute top-0 bottom-0 right-0 left-0"
       :class="isDragged ? 'cursor-grab' : 'cursor-pointer'"
       @dblclick="maybeToggleDefaultValue"
+      @click="maybeToggleCheckboxValue"
     />
     <span
       v-if="field?.type && editable"
@@ -302,6 +305,11 @@ export default {
       type: Object,
       required: true
     },
+    inputMode: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     isDraw: {
       type: Boolean,
       required: false,
@@ -312,6 +320,11 @@ export default {
       required: false,
       default: null
     },
+    withFieldPlaceholder: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     defaultSubmitters: {
       type: Array,
       required: false,
@@ -355,6 +368,9 @@ export default {
         return this.field?.default_value || this.field?.default_value === 0
       }
     },
+    isValueInput () {
+      return (this.field.type === 'heading' && this.isSelected) || this.isContenteditable || (this.inputMode && ['text', 'number', 'date'].includes(this.field.type))
+    },
     modalContainerEl () {
       return this.$el.getRootNode().querySelector('#docuseal_modal_container')
     },
@@ -481,16 +497,7 @@ export default {
       if (['text', 'number'].includes(this.field.type)) {
         this.isContenteditable = true
 
-        this.$nextTick(() => {
+        this.$nextTick(() => this.focusValueInput())
-          this.$refs.defaultValue.focus()
-
-          if (this.$refs.defaultValue.innerText.length) {
-            window.getSelection().collapse(
-              this.$refs.defaultValue.firstChild,
-              this.$refs.defaultValue.innerText.length
-            )
-          }
-        })
       } else if (this.field.type === 'checkbox') {
         this.field.readonly = !this.field.readonly
         this.field.default_value === true ? delete this.field.default_value : this.field.default_value = true
@@ -503,6 +510,26 @@ export default {
         this.save()
       }
     },
+    maybeToggleCheckboxValue () {
+      if (this.inputMode && this.field.type === 'checkbox') {
+        this.field.readonly = !this.field.readonly
+        this.field.default_value === true ? delete this.field.default_value : this.field.default_value = true
+
+        this.save()
+      }
+    },
+    focusValueInput (e) {
+      if (this.$refs.defaultValue !== document.activeElement) {
+        this.$refs.defaultValue.focus()
+
+        if (this.$refs.defaultValue.innerText.length && this.$refs.defaultValue !== e?.target) {
+          window.getSelection().collapse(
+            this.$refs.defaultValue.firstChild,
+            this.$refs.defaultValue.innerText.length
+          )
+        }
+      }
+    },
     formatNumber (number, format) {
       if (format === 'comma') {
         return new Intl.NumberFormat('en-US').format(number)
@@ -548,7 +575,7 @@ export default {
     onPaste (e) {
       const text = (e.clipboardData || window.clipboardData).getData('text/plain')
 
-      const selection = window.getSelection()
+      const selection = this.$el.getRootNode().getSelection()
 
       if (selection.rangeCount) {
         selection.deleteFromDocument()
@@ -572,6 +599,10 @@ export default {
         delete this.field.options
       }
 
+      if (['heading'].includes(this.field.type)) {
+        this.field.readonly = true
+      }
+
       if (['select', 'multiple', 'radio'].includes(this.field.type)) {
         this.field.options ||= [{ value: '', uuid: v4() }]
       }
@@ -633,7 +664,11 @@ export default {
       this.save()
     },
     onDefaultValueEnter (e) {
-      this.$refs.defaultValue.blur()
+      if (this.field.type !== 'heading') {
+        e.preventDefault()
+
+        this.$refs.defaultValue.blur()
+      }
     },
     onNameEnter (e) {
       this.$refs.name.blur()
@@ -652,24 +687,8 @@ export default {
         this.area.y = (e.offsetY - this.dragFrom.y) / e.target.clientHeight
       }
     },
-    startDrag (e) {
-      this.selectedAreaRef.value = this.area
-
-      if (!this.editable) {
-        return
-      }
-
-      const rect = e.target.getBoundingClientRect()
-
-      this.dragFrom = { x: e.clientX - rect.left, y: e.clientY - rect.top }
-
-      this.$el.getRootNode().addEventListener('mousemove', this.drag)
-      this.$el.getRootNode().addEventListener('mouseup', this.stopDrag)
-
-      this.$emit('start-drag')
-    },
     startTouchDrag (e) {
-      if (e.target !== this.$refs.touchTarget) {
+      if (e.target !== this.$refs.touchTarget && e.target !== this.$refs.touchValueTarget) {
         return
       }
 
@@ -714,11 +733,13 @@ export default {
       this.$emit('stop-drag')
     },
     startMouseMove (e) {
-      if (e.target !== this.$refs.touchTarget) {
+      if (e.target !== this.$refs.touchTarget && e.target !== this.$refs.touchValueTarget) {
         return
       }
 
-      document.activeElement?.blur()
+      if (document.activeElement !== this.$refs.defaultValue) {
+        document.activeElement?.blur()
+      }
 
       e.preventDefault()
 
@@ -728,6 +749,10 @@ export default {
 
       this.selectedAreaRef.value = this.area
 
+      if (this.field.type === 'heading') {
+        this.$nextTick(() => this.focusValueInput())
+      }
+
       this.dragFrom = { x: rect.left - e.clientX, y: rect.top - e.clientY }
 
       this.$el.getRootNode().addEventListener('mousemove', this.mouseMove)

app/javascript/template_builder/builder.vue

@@ -58,6 +58,7 @@
         />
         <template v-else>
           <a
+            v-if="withSignYourselfButton"
             :href="template.submitters.length > 1 ? `/templates/${template.id}/submissions/new?selfsign=true` : `/d/${template.slug}`"
             class="btn btn-primary btn-ghost text-base hidden md:flex"
             :target="template.submitters.length > 1 ? '' : '_blank'"
@@ -73,6 +74,7 @@
             </span>
           </a>
           <a
+            v-if="withSendButton"
             :href="`/templates/${template.id}/submissions/new?with_link=true`"
             data-turbo-frame="modal"
             class="white-button md:!px-6"
@@ -129,7 +131,18 @@
                     class="flex items-center justify-center space-x-2"
                   >
                     <IconEye class="w-6 h-6 flex-shrink-0" />
-                    <span class="whitespace-nowrap">Save and Preview</span>
+                    <span class="whitespace-nowrap">{{ t('save_and_preview') }}</span>
+                  </a>
+                </li>
+                <li>
+                  <a
+                    :href="`/templates/${template.id}/preferences`"
+                    data-turbo-frame="modal"
+                    class="flex space-x-2"
+                    @click="closeDropdown"
+                  >
+                    <IconAdjustments class="w-6 h-6 flex-shrink-0" />
+                    <span class="whitespace-nowrap">{{ t('preferences') }}</span>
                   </a>
                 </li>
               </ul>
@@ -177,7 +190,7 @@
           @change="save"
         />
         <div
-          class="sticky bottom-0 py-2"
+          class="sticky bottom-0 py-2 space-y-2"
           :style="{ backgroundColor }"
         >
           <Upload
@@ -186,6 +199,22 @@
             :template-id="template.id"
             @success="updateFromUpload"
           />
+          <button
+            v-if="sortedDocuments.length && editable && withAddPageButton"
+            id="add_blank_page_button"
+            class="btn btn-outline w-full"
+            @click.prevent="addBlankPage"
+          >
+            <IconInnerShadowTop
+              v-if="isLoadingBlankPage"
+              class="animate-spin w-5 h-5"
+            />
+            <IconPlus
+              v-else
+              class="w-5 h-5"
+            />
+            {{ t('add_blank_page') }}
+          </button>
         </div>
       </div>
       <div
@@ -196,12 +225,30 @@
           ref="documents"
           class="pr-3.5 pl-0.5"
         >
-          <Dropzone
+          <template v-if="!sortedDocuments.length && (withUploadButton || withAddPageButton)">
-            v-if="!sortedDocuments.length && withUploadButton"
+            <Dropzone
-            :template-id="template.id"
+              v-if="withUploadButton"
-            :accept-file-types="acceptFileTypes"
+              :template-id="template.id"
-            @success="updateFromUpload"
+              :accept-file-types="acceptFileTypes"
-          />
+              @success="updateFromUpload"
+            />
+            <button
+              v-if="withAddPageButton"
+              id="add_blank_page_button"
+              class="btn btn-outline w-full mt-4"
+              @click.prevent="addBlankPage"
+            >
+              <IconInnerShadowTop
+                v-if="isLoadingBlankPage"
+                class="animate-spin w-5 h-5"
+              />
+              <IconPlus
+                v-else
+                class="w-5 h-5"
+              />
+              {{ t('add_blank_page') }}
+            </button>
+          </template>
           <template v-else>
             <template
               v-for="document in sortedDocuments"
@@ -213,9 +260,11 @@
                 :selected-submitter="selectedSubmitter"
                 :document="document"
                 :is-drag="!!dragField"
+                :input-mode="inputMode"
                 :default-fields="[...defaultRequiredFields, ...defaultFields]"
                 :allow-draw="!onlyDefinedFields"
                 :default-submitters="defaultSubmitters"
+                :with-field-placeholder="withFieldPlaceholder"
                 :draw-field="drawField"
                 :draw-field-type="drawFieldType"
                 :editable="editable"
@@ -242,7 +291,7 @@
             </template>
             <div
               v-if="sortedDocuments.length && isBreakpointLg && editable"
-              class="pb-4"
+              class="pb-4 space-y-2"
             >
               <Upload
                 v-if="withUploadButton"
@@ -250,6 +299,22 @@
                 :accept-file-types="acceptFileTypes"
                 @success="updateFromUpload"
               />
+              <button
+                v-if="withAddPageButton"
+                id="add_blank_page_button"
+                class="btn btn-outline w-full mt-4"
+                @click.prevent="addBlankPage"
+              >
+                <IconInnerShadowTop
+                  v-if="isLoadingBlankPage"
+                  class="animate-spin w-5 h-5"
+                />
+                <IconPlus
+                  v-else
+                  class="w-5 h-5"
+                />
+                {{ t('add_blank_page') }}
+              </button>
             </div>
           </template>
         </div>
@@ -277,7 +342,7 @@
                 {{ t('cancel') }}
               </button>
               <a
-                v-if="!drawField && !drawOption && !['stamp', 'signature', 'initials'].includes(drawField?.type || drawFieldType)"
+                v-if="!drawField && !drawOption && !['stamp', 'signature', 'initials', 'heading'].includes(drawField?.type || drawFieldType)"
                 href="#"
                 class="link block mt-3 text-sm"
                 @click.prevent="[addField(drawFieldType), drawField = null, drawOption = null, withSelectedFieldType ? '' : drawFieldType = '', showDrawField = false]"
@@ -350,10 +415,10 @@ import Contenteditable from './contenteditable'
 import DocumentPreview from './preview'
 import DocumentControls from './controls'
 import MobileFields from './mobile_fields'
-import { IconUsersPlus, IconDeviceFloppy, IconChevronDown, IconEye, IconWritingSign, IconInnerShadowTop, IconInfoCircle } from '@tabler/icons-vue'
+import { IconPlus, IconUsersPlus, IconDeviceFloppy, IconChevronDown, IconEye, IconWritingSign, IconInnerShadowTop, IconInfoCircle, IconAdjustments } from '@tabler/icons-vue'
 import { v4 } from 'uuid'
 import { ref, computed } from 'vue'
-import { en as i18nEn } from './i18n'
+import * as i18n from './i18n'
 
 export default {
   name: 'TemplateBuilder',
@@ -363,6 +428,7 @@ export default {
     Fields,
     IconInfoCircle,
     MobileDrawField,
+    IconPlus,
     IconWritingSign,
     MobileFields,
     Logo,
@@ -373,6 +439,7 @@ export default {
     Contenteditable,
     IconUsersPlus,
     IconChevronDown,
+    IconAdjustments,
     IconEye,
     IconDeviceFloppy
   },
@@ -382,6 +449,7 @@ export default {
       save: this.save,
       t: this.t,
       currencies: this.currencies,
+      locale: this.locale,
       baseFetch: this.baseFetch,
       fieldTypes: this.fieldTypes,
       backgroundColor: this.backgroundColor,
@@ -405,21 +473,51 @@ export default {
       required: false,
       default: () => ({})
     },
+    withFieldPlaceholder: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     backgroundColor: {
       type: String,
       required: false,
       default: ''
     },
+    locale: {
+      type: String,
+      required: false,
+      default: ''
+    },
     editable: {
       type: Boolean,
       required: false,
       default: true
     },
+    withSendButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    withSignYourselfButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    inputMode: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withHelp: {
       type: Boolean,
       required: false,
       default: true
     },
+    withAddPageButton: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     autosave: {
       type: Boolean,
       required: false,
@@ -566,6 +664,7 @@ export default {
     return {
       documentRefs: [],
       isBreakpointLg: false,
+      isLoadingBlankPage: false,
       isSaving: false,
       selectedSubmitter: null,
       showDrawField: false,
@@ -580,6 +679,23 @@ export default {
   computed: {
     selectedAreaRef: () => ref(),
     fieldsDragFieldRef: () => ref(),
+    language () {
+      return this.locale.split('-')[0].toLowerCase()
+    },
+    defaultDateFormat () {
+      const isUsBrowser = Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US')
+      const isUsTimezone = new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/)
+
+      return this.localeDateFormats[this.locale] || ((isUsBrowser || isUsTimezone) ? 'MM/DD/YYYY' : 'DD/MM/YYYY')
+    },
+    localeDateFormats () {
+      return {
+        'de-DE': 'DD.MM.YYYY',
+        'fr-FR': 'DD/MM/YYYY',
+        'it-IT': 'DD/MM/YYYY',
+        'es-ES': 'DD/MM/YYYY'
+      }
+    },
     fieldAreasIndex () {
       const areas = {}
 
@@ -669,8 +785,11 @@ export default {
     this.documentRefs = []
   },
   methods: {
+    closeDropdown () {
+      document.activeElement.blur()
+    },
     t (key) {
-      return this.i18n[key] || i18nEn[key] || key
+      return this.i18n[key] || i18n[this.language]?.[key] || i18n.en[key] || key
     },
     removePendingFields () {
       this.template.fields = this.template.fields.filter((f) => {
@@ -699,7 +818,7 @@ export default {
 
       if (type === 'date') {
         field.preferences = {
-          format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+          format: this.defaultDateFormat
         }
       }
 
@@ -732,7 +851,7 @@ export default {
 
         if (type === 'date') {
           field.preferences = {
-            format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+            format: this.defaultDateFormat
           }
         }
 
@@ -1063,13 +1182,13 @@ export default {
           field.options = [{ value: '', uuid: v4() }]
         }
 
-        if (field.type === 'stamp') {
+        if (['stamp', 'heading'].includes(field.type)) {
           field.readonly = true
         }
 
         if (field.type === 'date') {
           field.preferences = {
-            format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+            format: this.defaultDateFormat
           }
         }
       }
@@ -1147,6 +1266,44 @@ export default {
       this.save()
 
       document.activeElement?.blur()
+
+      if (field.type === 'heading') {
+        this.$nextTick(() => {
+          const documentRef = this.documentRefs.find((e) => e.document.uuid === area.attachment_uuid)
+          const areaRef = documentRef.pageRefs[area.page].areaRefs.find((ref) => ref.area === this.selectedAreaRef.value)
+
+          areaRef.focusValueInput()
+        })
+      }
+    },
+    addBlankPage () {
+      this.isLoadingBlankPage = true
+
+      const canvas = document.createElement('canvas')
+
+      canvas.width = 816
+      canvas.height = 1056
+
+      const ctx = canvas.getContext('2d')
+
+      ctx.fillStyle = 'white'
+      ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+      canvas.toBlob((blob) => {
+        const file = new File([blob], `Page ${this.template.schema.length + 1}.png`, { type: blob.type, lastModified: Date.now() })
+
+        const formData = new FormData()
+        formData.append('files[]', file)
+
+        this.baseFetch(`/templates/${this.template.id}/documents`, {
+          method: 'POST',
+          body: formData
+        }).then(async (resp) => {
+          this.updateFromUpload(await resp.json())
+        }).finally(() => {
+          this.isLoadingBlankPage = false
+        })
+      }, 'image/png')
     },
     updateFromUpload (data) {
       this.template.schema.push(...data.schema)
@@ -1297,7 +1454,7 @@ export default {
       if (!this.template.fields.length) {
         e.preventDefault()
 
-        alert('Please draw fields to prepare the document.')
+        alert(this.t('please_draw_fields_to_prepare_the_document'))
       } else {
         const submitterWithoutFields =
           this.template.submitters.find((submitter) => !this.template.fields.some((f) => f.submitter_uuid === submitter.uuid))
@@ -1305,7 +1462,7 @@ export default {
         if (submitterWithoutFields) {
           e.preventDefault()
 
-          alert(`Please add fields for the ${submitterWithoutFields.name}. Or, remove the ${submitterWithoutFields.name} if not needed.`)
+          alert(this.t('please_add_fields_for_the_submitter_name_or_remove_the_submitter_name_if_not_needed').replaceAll('{submitter_name}', submitterWithoutFields.name))
         }
       }
     },
@@ -1321,13 +1478,13 @@ export default {
       }
 
       if (!this.template.fields.length) {
-        alert('Please draw fields to prepare the document.')
+        alert(this.t('please_draw_fields_to_prepare_the_document'))
       } else {
         const submitterWithoutFields =
           this.template.submitters.find((submitter) => !this.template.fields.some((f) => f.submitter_uuid === submitter.uuid))
 
         if (submitterWithoutFields) {
-          alert(`Please add fields for the ${submitterWithoutFields.name}. Or, remove the ${submitterWithoutFields.name} if not needed.`)
+          alert(this.t('please_add_fields_for_the_submitter_name_or_remove_the_submitter_name_if_not_needed').replaceAll('{submitter_name}', submitterWithoutFields.name))
         } else {
           this.isSaving = true
 

app/javascript/template_builder/conditions_modal.vue

@@ -26,7 +26,7 @@
             href="https://www.docuseal.co/pricing"
             target="_blank"
             class="link"
-          >Available in Pro</a>
+          >{{ t('available_in_pro') }}</a>
         </div>
         <form @submit.prevent="validateSaveAndClose">
           <div class="my-4 space-y-5">
@@ -200,7 +200,7 @@ export default {
     },
     validateSaveAndClose () {
       if (!this.withConditions) {
-        return alert('Available only in Pro')
+        return alert(this.t('available_only_in_pro'))
       }
 
       if (this.conditions.find((f) => f.field_uuid)) {

app/javascript/template_builder/contenteditable.vue

@@ -101,7 +101,7 @@ export default {
     onPaste (e) {
       const text = (e.clipboardData || window.clipboardData).getData('text/plain')
 
-      const selection = window.getSelection()
+      const selection = this.$el.getRootNode().getSelection()
 
       if (selection.rangeCount) {
         selection.deleteFromDocument()

app/javascript/template_builder/document.vue

@@ -4,11 +4,13 @@
       v-for="(image, index) in sortedPreviewImages"
       :key="image.id"
       :ref="setPageRefs"
+      :input-mode="inputMode"
       :number="index"
       :editable="editable"
       :areas="areasIndex[index]"
       :allow-draw="allowDraw"
       :is-drag="isDrag"
+      :with-field-placeholder="withFieldPlaceholder"
       :default-fields="defaultFields"
       :default-submitters="defaultSubmitters"
       :draw-field="drawField"
@@ -35,6 +37,11 @@ export default {
       type: Object,
       required: true
     },
+    inputMode: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     areasIndex: {
       type: Object,
       required: false,
@@ -45,6 +52,11 @@ export default {
       required: false,
       default: () => []
     },
+    withFieldPlaceholder: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     drawFieldType: {
       type: String,
       required: false,

app/javascript/template_builder/dropzone.vue

@@ -5,6 +5,7 @@
     @drop.prevent="onDropFiles"
   >
     <label
+      id="document_dropzone"
       class="w-full relative hover:bg-base-200/30 rounded-md border border-2 border-base-content/10 border-dashed"
       :for="inputId"
       :class="{ 'opacity-50': isLoading || isProcessing }"
@@ -104,7 +105,7 @@ export default {
 
         this.upload()
       } else {
-        alert('Only PDF and images are supported.')
+        alert(this.t('only_pdf_and_images_are_supported'))
       }
     }
   }

app/javascript/template_builder/field.vue

@@ -14,7 +14,7 @@
         <div class="flex items-center p-1 space-x-1">
           <FieldType
             v-model="field.type"
-            :editable="editable && !defaultField"
+            :editable="editable && !defaultField && field.type != 'heading'"
             :button-width="20"
             :menu-classes="'mt-1.5'"
             :menu-style="{ backgroundColor: dropdownBgColor }"
@@ -24,7 +24,7 @@
           <Contenteditable
             ref="name"
             :model-value="(defaultField ? (field.title || field.name) : field.name) || defaultName"
-            :editable="editable && !defaultField"
+            :editable="editable && !defaultField && field.type != 'heading'"
             :icon-inline="true"
             :icon-width="18"
             :icon-stroke-width="1.6"
@@ -94,9 +94,10 @@
             :field="field"
             @click-condition="isShowConditionsModal = true"
             @click-description="isShowDescriptionModal = true"
+            @click-formula="isShowFormulaModal = true"
           />
           <span
-            v-else
+            v-else-if="field.type !== 'heading'"
             class="dropdown dropdown-end"
             @mouseenter="renderDropdown = true"
             @touchstart="renderDropdown = true"
@@ -129,6 +130,7 @@
                 @click-description="isShowDescriptionModal = true"
                 @click-condition="isShowConditionsModal = true"
                 @set-draw="$emit('set-draw', $event)"
+                @remove-area="removeArea"
                 @scroll-to="$emit('scroll-to', $event)"
               />
             </ul>
@@ -280,7 +282,7 @@ export default {
     IconMathFunction,
     FieldType
   },
-  inject: ['template', 'save', 'backgroundColor', 'selectedAreaRef', 't'],
+  inject: ['template', 'save', 'backgroundColor', 'selectedAreaRef', 't', 'locale'],
   props: {
     field: {
       type: Object,
@@ -340,12 +342,17 @@ export default {
 
     if (this.field.type === 'date') {
       this.field.preferences.format ||=
-        (Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY')
+       ({ 'de-DE': 'DD.MM.YYYY' }[this.locale] || ((Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/)) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'))
     }
   },
   methods: {
+    removeArea (area) {
+      this.field.areas.splice(this.field.areas.indexOf(area), 1)
+
+      this.save()
+    },
     buildDefaultName (field, fields) {
-      if (field.type === 'payment' && field.preferences?.price) {
+      if (field.type === 'payment' && field.preferences?.price && !field.preferences?.formula) {
         const { price, currency } = field.preferences || {}
 
         const formattedPrice = new Intl.NumberFormat([], {
@@ -357,9 +364,12 @@ export default {
       } else {
         const typeIndex = fields.filter((f) => f.type === field.type).indexOf(field)
 
-        const suffix = { multiple: this.t('select'), radio: this.t('group') }[field.type] || this.t('field')
+        if (this.field.type === 'heading') {
-
+          return `${this.fieldNames[field.type]} ${typeIndex + 1}`
-        return `${this.fieldNames[field.type]} ${suffix} ${typeIndex + 1}`
+        } else {
+          const suffix = { multiple: this.t('select'), radio: this.t('group') }[field.type] || this.t('field')
+          return `${this.fieldNames[field.type]} ${suffix} ${typeIndex + 1}`
+        }
       }
     },
     onNameFocus (e) {
@@ -417,6 +427,10 @@ export default {
         this.field.options ||= [{ value: '', uuid: v4() }]
       }
 
+      if (['heading'].includes(this.field.type)) {
+        this.field.readonly = true
+      }
+
       (this.field.areas || []).forEach((area) => {
         if (this.field.type === 'cells') {
           area.cell_w = area.w * 2 / Math.floor(area.w / area.h)

app/javascript/template_builder/field_settings.vue

@@ -358,7 +358,7 @@
     >
       <a
         href="#"
-        class="text-sm py-1 px-2"
+        class="text-sm py-1 px-2 group/1"
         @click.prevent="$emit('scroll-to', area)"
       >
         <IconShape
@@ -367,6 +367,11 @@
         />
         {{ t('page') }}
         <template v-if="template.schema.length > 1">{{ template.schema.findIndex((item) => item.attachment_uuid === area.attachment_uuid) + 1 }}-</template>{{ area.page + 1 }}
+        <IconX
+          :width="12"
+          class="group-hover/1:inline hidden"
+          @click.prevent.stop="[$emit('remove-area', area), $event.target.closest('.dropdown').querySelector('label').focus()]"
+        />
       </a>
     </li>
     <li v-if="!field.areas?.length || !['radio', 'multiple'].includes(field.type)">
@@ -399,7 +404,7 @@
 </template>
 
 <script>
-import { IconRouteAltLeft, IconShape, IconMathFunction, IconNewSection, IconInfoCircle, IconCopy } from '@tabler/icons-vue'
+import { IconRouteAltLeft, IconShape, IconX, IconMathFunction, IconNewSection, IconInfoCircle, IconCopy } from '@tabler/icons-vue'
 
 export default {
   name: 'FieldSettings',
@@ -409,7 +414,8 @@ export default {
     IconMathFunction,
     IconRouteAltLeft,
     IconCopy,
-    IconNewSection
+    IconNewSection,
+    IconX
   },
   inject: ['template', 'save', 't'],
   props: {
@@ -443,7 +449,7 @@ export default {
       default: true
     }
   },
-  emits: ['set-draw', 'scroll-to', 'click-formula', 'click-description', 'click-condition'],
+  emits: ['set-draw', 'scroll-to', 'click-formula', 'click-description', 'click-condition', 'remove-area'],
   data () {
     return {
     }

app/javascript/template_builder/field_type.vue

@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { IconTextSize, IconWritingSign, IconCalendarEvent, IconPhoto, IconCheckbox, IconPaperclip, IconSelect, IconCircleDot, IconChecks, IconColumns3, IconPhoneCheck, IconLetterCaseUpper, IconCreditCard, IconRubberStamp, IconSquareNumber1 } from '@tabler/icons-vue'
+import { IconTextSize, IconWritingSign, IconCalendarEvent, IconPhoto, IconCheckbox, IconPaperclip, IconSelect, IconCircleDot, IconChecks, IconColumns3, IconPhoneCheck, IconLetterCaseUpper, IconCreditCard, IconRubberStamp, IconSquareNumber1, IconHeading } from '@tabler/icons-vue'
 
 export default {
   name: 'FiledTypeDropdown',
@@ -96,6 +96,7 @@ export default {
   computed: {
     fieldNames () {
       return {
+        heading: this.t('heading'),
         text: this.t('text'),
         signature: this.t('signature'),
         initials: this.t('initials'),
@@ -115,6 +116,7 @@ export default {
     },
     fieldIcons () {
       return {
+        heading: IconHeading,
         text: IconTextSize,
         signature: IconWritingSign,
         initials: IconLetterCaseUpper,
@@ -140,7 +142,7 @@ export default {
           return acc
         }, {})
       } else {
-        return this.fieldIcons
+        return Object.fromEntries(Object.entries(this.fieldIcons).filter(([key]) => key !== 'heading'))
       }
     }
   },

app/javascript/template_builder/fields.vue

@@ -137,7 +137,7 @@
         v-else-if="type == 'phone' && (fieldTypes.length === 0 || fieldTypes.includes(type))"
         class="tooltip tooltip-bottom flex"
         :class="{'tooltip-bottom-end': withPayment, 'tooltip-bottom': !withPayment }"
-        data-tip="Unlock SMS-verified phone number field with paid plan. Use text field for phone numbers without verification."
+        :data-tip="t('unlock_sms_verified_phone_number_field_with_paid_plan_use_text_field_for_phone_numbers_without_verification')"
       >
         <a
           href="https://www.docuseal.co/pricing"
@@ -168,13 +168,13 @@
   >
     <ul class="list-disc list-outside ml-3">
       <li>
-        Draw a text field on the page with a mouse
+        {{ t('draw_a_text_field_on_the_page_with_a_mouse') }}
       </li>
       <li>
-        Drag &amp; drop any other field type on the page
+        {{ t('drag_and_drop_any_other_field_type_on_the_page') }}
       </li>
       <li>
-        Click on the field type above to start drawing it
+        {{ t('click_on_the_field_type_above_to_start_drawing_it') }}
       </li>
     </ul>
   </div>
@@ -277,7 +277,7 @@ export default {
           return acc
         }, {})
       } else {
-        return this.fieldIcons
+        return Object.fromEntries(Object.entries(this.fieldIcons).filter(([key]) => key !== 'heading'))
       }
     },
     submitterFields () {

app/javascript/template_builder/formula_modal.vue

@@ -26,7 +26,7 @@
             href="https://www.docuseal.co/pricing"
             target="_blank"
             class="link"
-          >Available in Pro</a>
+          >{{ t('available_in_pro') }}</a>
         </div>
         <div class="flex-inline mb-2 gap-2 space-y-1">
           <button
@@ -195,16 +195,19 @@ export default {
     },
     validateSaveAndClose () {
       if (!this.withFormula) {
-        return alert('Available only in Pro')
+        return alert(this.t('available_only_in_pro'))
       }
 
       const normalizedFormula = this.normalizeFormula(this.formula)
 
       if (normalizedFormula.includes('FIELD NOT FOUND')) {
-        alert('Some fields are missing in the formula.')
+        alert(this.t('some_fields_are_missing_in_the_formula'))
       } else {
         this.field.preferences.formula = normalizedFormula
-        this.field.readonly = !!normalizedFormula
+
+        if (this.field.type !== 'payment') {
+          this.field.readonly = !!normalizedFormula
+        }
 
         this.save()
 

app/javascript/template_builder/i18n.js

@@ -8,13 +8,16 @@ const en = {
   uploaded_pdf_contains_form_fields_keep_or_remove_them: 'Uploaded PDF contains form fields. Keep or remove them?',
   keep: 'Keep',
   left: 'Left',
+  heading: 'Heading',
   validation: 'Validation',
+  add_blank_page: 'Add blank page',
   right: 'Right',
   center: 'Center',
   description: 'Description',
   display_title: 'Display title',
   with_logo: 'With logo',
   unchecked: 'Unchecked',
+  price: 'Price',
   type_value: 'Type value',
   equal: 'Equal',
   not_equal: 'Not equal',
@@ -101,6 +104,15 @@ const en = {
   field: 'Field',
   group: 'Group',
   draw_a_text_field_on_the_page_with_a_mouse: 'Draw a text field on the page with a mouse',
+  drag_and_drop_any_other_field_type_on_the_page: 'Drag & drop any other field type on the page',
+  click_on_the_field_type_above_to_start_drawing_it: 'Click on the field type above to start drawing it',
+  please_draw_fields_to_prepare_the_document: 'Please draw fields to prepare the document.',
+  only_pdf_and_images_are_supported: 'Only PDF and images are supported.',
+  unlock_sms_verified_phone_number_field_with_paid_plan_use_text_field_for_phone_numbers_without_verification: 'Unlock SMS-verified phone number field with paid plan. Use text field for phone numbers without verification.',
+  available_only_in_pro: 'Available only in Pro',
+  failed_to_download_files: 'Failed to download files',
+  signature_is_too_small_please_redraw: 'Signature is too small - please redraw.',
+  please_add_fields_for_the_submitter_name_or_remove_the_submitter_name_if_not_needed: 'Please add fields for the {submitter_name}. Or, remove the {submitter_name} if not needed.',
   draw_field: 'Draw {field} Field',
   replace: 'Replace',
   uploading_: 'Uploading...',
@@ -114,7 +126,710 @@ const en = {
   custom: 'Custom',
   numbers_only: 'Numbers only',
   letters_only: 'Letters only',
-  regexp_validation: 'Regexp validation'
+  regexp_validation: 'Regexp validation',
+  enter_pdf_password: 'Enter PDF password',
+  wrong_password: 'Wrong password',
+  currency: 'Currency',
+  save_and_preview: 'Save and Preview',
+  preferences: 'Preferences',
+  available_in_pro: 'Available in Pro',
+  some_fields_are_missing_in_the_formula: 'Some fields are missing in the formula.',
+  learn_more: 'Learn more'
 }
 
-export { en }
+const es = {
+  editable: 'Editable',
+  search_field: 'Campo de búsqueda',
+  field_not_found: 'Campo no encontrado',
+  clear: 'Borrar',
+  type_value: 'Escriba valor',
+  align: 'Alinear',
+  add_all_required_fields_to_continue: 'Agregar todos los campos requeridos para continuar',
+  uploaded_pdf_contains_form_fields_keep_or_remove_them: 'El PDF cargado tiene campos. ¿Mantenerlos o eliminarlos?',
+  keep: 'Mantener',
+  left: 'Izquierda',
+  heading: 'Encabezado',
+  validation: 'Validación',
+  add_blank_page: 'Agregar página en blanco',
+  right: 'Derecha',
+  center: 'Centro',
+  with_logo: 'Con logotipo',
+  description: 'Descripción',
+  signing_date: 'Fecha de Firma',
+  display_title: 'Título de visualización',
+  unchecked: 'No marcado',
+  price: 'Precio',
+  equal: 'Igual',
+  not_equal: 'No es igual',
+  contains: 'Contiene',
+  does_not_contain: 'No contiene',
+  not_empty: 'No vacío',
+  empty: 'Vacío',
+  select_field_: 'Seleccionar campo...',
+  select_value_: 'Seleccionar valor...',
+  remove_condition: 'Eliminar condición',
+  add_condition: 'Agregar condición',
+  condition: 'Condición',
+  formula: 'Fórmula',
+  edit: 'Editar',
+  settings: 'Configuración',
+  up: 'Arriba',
+  down: 'Abajo',
+  set_signing_date: 'Establecer fecha de firma',
+  are_you_sure: '¿Estás seguro?',
+  sign_yourself: 'Firma tú mismo',
+  checked: 'Seleccionado',
+  send: 'Enviar',
+  remove: 'Eliminar',
+  save: 'Guardar',
+  cancel: 'Cancelar',
+  or_add_field_without_drawing: 'O añadir campo sin dibujar',
+  draw_field_on_the_document: 'Dibujar campo {field} en el documento',
+  click_to_upload: 'Haz clic para cargar',
+  or_drag_and_drop_files: 'o arrastra y suelta archivos',
+  uploading: 'Subiendo',
+  processing_: 'Procesando...',
+  add_pdf_documents_or_images: 'Agregar documentos PDF o imágenes',
+  add_documents_or_images: 'Agregar documentos o imágenes',
+  required: 'Requerido',
+  default_value: 'Valor predeterminado',
+  format: 'Formato',
+  read_only: 'Solo lectura',
+  page: 'Página',
+  draw_new_area: 'Dibujar nueva área',
+  copy_to_all_pages: 'Copiar a todas las páginas',
+  add_option: 'Agregar opción',
+  option: 'Opción',
+  first_party: 'Primera Parte',
+  second_party: 'Segunda Parte',
+  third_party: 'Tercera Parte',
+  fourth_party: 'Cuarta Parte',
+  fifth_party: 'Quinta Parte',
+  sixth_party: 'Sexta Parte',
+  seventh_party: 'Séptima Parte',
+  eighth_party: 'Octava Parte',
+  ninth_party: 'Novena Parte',
+  tenth_party: 'Décima Parte',
+  eleventh_party: 'Undécimo Partido',
+  twelfth_party: 'Duodécimo Partido',
+  thirteenth_party: 'Decimotercer Partido',
+  fourteenth_party: 'Catorceavo Partido',
+  fifteenth_party: 'Quinceavo Partido',
+  sixteenth_party: 'Dieciséisavo Partido',
+  seventeenth_party: 'Diecisieteavo Partido',
+  eighteenth_party: 'Dieciochoavo Partido',
+  nineteenth_party: 'Decimonovena Fiesta',
+  twentieth_party: 'Vigésima Fiesta',
+  draw: 'Dibujar',
+  add: 'Agregar',
+  text: 'Texto',
+  signature: 'Firma',
+  initials: 'Iniciales',
+  date: 'Fecha',
+  number: 'Número',
+  image: 'Imagen',
+  file: 'Archivo',
+  select: 'Seleccionar',
+  checkbox: 'Casilla',
+  multiple: 'Múltiple',
+  field: 'Campo',
+  group: 'Grupo',
+  radio: 'Radio',
+  cells: 'Celdas',
+  stamp: 'Sello',
+  payment: 'Pago',
+  phone: 'Teléfono',
+  draw_a_text_field_on_the_page_with_a_mouse: 'Dibujar un campo de texto en la página con el mouse',
+  drag_and_drop_any_other_field_type_on_the_page: 'Arrastra y suelta cualquier otro tipo de campo en la página',
+  click_on_the_field_type_above_to_start_drawing_it: 'Haz clic en el tipo de campo de arriba para comenzar a dibujarlo',
+  please_draw_fields_to_prepare_the_document: 'Por favor, dibuja los campos para preparar el documento.',
+  only_pdf_and_images_are_supported: 'Solo se admiten PDF e imágenes.',
+  unlock_sms_verified_phone_number_field_with_paid_plan_use_text_field_for_phone_numbers_without_verification: 'Desbloquea el campo de número de teléfono verificado por SMS con un plan pago. Usa el campo de texto para números de teléfono sin verificación.',
+  available_only_in_pro: 'Disponible solo en Pro',
+  failed_to_download_files: 'Error al descargar los archivos',
+  signature_is_too_small_please_redraw: 'La firma es demasiado pequeña. Por favor, dibújala de nuevo.',
+  please_add_fields_for_the_submitter_name_or_remove_the_submitter_name_if_not_needed: 'Por favor, añade campos para {submitter_name} o elimina {submitter_name} si no es necesario.',
+  draw_field: 'Dibujar campo {field}',
+  replace: 'Reemplazar',
+  uploading_: 'Subiendo...',
+  add_document: 'Subir',
+  any: 'Cualquier',
+  drawn: 'Dibujado',
+  typed: 'Escrito',
+  none: 'Ninguno',
+  ssn: 'SSN',
+  ein: 'EIN',
+  email: 'Correo electrónico',
+  url: 'URL',
+  zip: 'ZIP',
+  custom: 'Personalizado',
+  numbers_only: 'Solo números',
+  letters_only: 'Solo letras',
+  regexp_validation: 'Validación de expresión regular',
+  enter_pdf_password: 'Ingrese la contraseña del PDF',
+  wrong_password: 'Contraseña incorrecta',
+  currency: 'Moneda',
+  save_and_preview: 'Guardar y previsualizar',
+  preferences: 'Preferencias',
+  available_in_pro: 'Disponible en Pro',
+  some_fields_are_missing_in_the_formula: 'Faltan algunos campos en la fórmula.',
+  learn_more: 'Aprende más'
+}
+
+const it = {
+  editable: 'Modificabile',
+  search_field: 'Campo di ricerca',
+  field_not_found: 'Campo non trovato',
+  clear: 'Cancella',
+  align: 'Allinea',
+  add_all_required_fields_to_continue: 'Aggiungi tutti i campi obbligatori per continuare',
+  uploaded_pdf_contains_form_fields_keep_or_remove_them: 'Il PDF caricato contiene campi del modulo. Mantenerli o rimuoverli?',
+  keep: 'Mantieni',
+  left: 'Sinistra',
+  heading: 'Intestazione',
+  validation: 'Validazione',
+  add_blank_page: 'Aggiungi pagina vuota',
+  right: 'Destra',
+  center: 'Centro',
+  description: 'Descrizione',
+  display_title: 'Mostra titolo',
+  with_logo: 'Con logo',
+  unchecked: 'Non selezionato',
+  price: 'Prezzo',
+  type_value: 'Inserisci valore',
+  equal: 'Uguale',
+  not_equal: 'Non uguale',
+  contains: 'Contiene',
+  does_not_contain: 'Non contiene',
+  not_empty: 'Non vuoto',
+  empty: 'Vuoto',
+  select_field_: 'Seleziona campo...',
+  select_value_: 'Seleziona valore...',
+  remove_condition: 'Rimuovi condizione',
+  add_condition: 'Aggiungi condizione',
+  are_you_sure: 'Sei sicuro?',
+  sign_yourself: 'Firma te stesso',
+  set_signing_date: 'Imposta data di firma',
+  signing_date: 'Data di firma',
+  send: 'Invia',
+  remove: 'Rimuovi',
+  edit: 'Modifica',
+  settings: 'Impostazioni',
+  up: 'Su',
+  down: 'Giù',
+  checked: 'Selezionato',
+  save: 'Salva',
+  cancel: 'Annulla',
+  any: 'Qualsiasi',
+  drawn: 'Disegnato',
+  formula: 'Formula',
+  typed: 'Digitato',
+  draw_field_on_the_document: 'Disegna il campo {field} sul documento',
+  click_to_upload: 'Clicca per caricare',
+  or_drag_and_drop_files: 'o trascina e rilascia i file',
+  uploading: 'Caricamento in corso',
+  processing_: 'Elaborazione...',
+  add_pdf_documents_or_images: 'Aggiungi documenti PDF o immagini',
+  add_documents_or_images: 'Aggiungi documenti o immagini',
+  required: 'Obbligatorio',
+  default_value: 'Valore predefinito',
+  format: 'Formato',
+  read_only: 'Sola lettura',
+  page: 'Pagina',
+  draw_new_area: 'Disegna nuova area',
+  copy_to_all_pages: 'Copia in tutte le pagine',
+  add_option: 'Aggiungi opzione',
+  option: 'Opzione',
+  condition: 'Condizione',
+  first_party: 'Prima parte',
+  second_party: 'Seconda parte',
+  third_party: 'Terza parte',
+  fourth_party: 'Quarta parte',
+  fifth_party: 'Quinta parte',
+  sixth_party: 'Sesta parte',
+  seventh_party: 'Settima parte',
+  eighth_party: 'Ottava parte',
+  ninth_party: 'Nona parte',
+  tenth_party: 'Decima parte',
+  eleventh_party: 'Undicesima parte',
+  twelfth_party: 'Dodicesima parte',
+  thirteenth_party: 'Tredicesima parte',
+  fourteenth_party: 'Quattordicesima parte',
+  fifteenth_party: 'Quindicesima parte',
+  sixteenth_party: 'Sedicesima parte',
+  seventeenth_party: 'Diciassettesima parte',
+  eighteenth_party: 'Diciottesima parte',
+  nineteenth_party: 'Diciannovesima parte',
+  twentieth_party: 'Ventesima parte',
+  draw: 'Disegna',
+  add: 'Aggiungi',
+  or_add_field_without_drawing: 'Oppure aggiungi campo senza disegno',
+  text: 'Testo',
+  number: 'Numero',
+  signature: 'Firma',
+  initials: 'Iniziali',
+  date: 'Data',
+  image: 'Immagine',
+  file: 'File',
+  select: 'Seleziona',
+  checkbox: 'Casella di controllo',
+  multiple: 'Multiplo',
+  radio: 'Radio',
+  cells: 'Celle',
+  stamp: 'Timbro',
+  payment: 'Pagamento',
+  phone: 'Telefono',
+  field: 'Campo',
+  group: 'Gruppo',
+  draw_a_text_field_on_the_page_with_a_mouse: 'Disegna un campo di testo sulla pagina con il mouse',
+  drag_and_drop_any_other_field_type_on_the_page: 'Trascina e rilascia qualsiasi altro tipo di campo sulla pagina',
+  click_on_the_field_type_above_to_start_drawing_it: 'Clicca sul tipo di campo sopra per iniziare a disegnarlo',
+  please_draw_fields_to_prepare_the_document: 'Per favore, disegna i campi per preparare il documento.',
+  only_pdf_and_images_are_supported: 'Sono supportati solo PDF e immagini.',
+  unlock_sms_verified_phone_number_field_with_paid_plan_use_text_field_for_phone_numbers_without_verification: 'Sblocca il campo numero di telefono verificato tramite SMS con un piano a pagamento. Usa il campo di testo per numeri di telefono senza verifica.',
+  available_only_in_pro: 'Disponibile solo in Pro',
+  failed_to_download_files: 'Impossibile scaricare i file',
+  signature_is_too_small_please_redraw: 'La firma è troppo piccola. Ridisegnala per favore.',
+  please_add_fields_for_the_submitter_name_or_remove_the_submitter_name_if_not_needed: 'Aggiungi campi per {submitter_name} o rimuovi {submitter_name} se non necessario.',
+  draw_field: 'Disegna il campo {field}',
+  replace: 'Sostituisci',
+  uploading_: 'Caricamento in corso...',
+  add_document: 'Aggiungi',
+  none: 'Nessuno',
+  ssn: 'SSN',
+  ein: 'EIN',
+  email: 'Email',
+  url: 'URL',
+  zip: 'CAP',
+  custom: 'Personalizzato',
+  numbers_only: 'Solo numeri',
+  letters_only: 'Solo lettere',
+  regexp_validation: 'Validazione regexp',
+  enter_pdf_password: 'Inserisci password PDF',
+  wrong_password: 'Password errata',
+  currency: 'Valuta',
+  save_and_preview: 'Salva e Anteprima',
+  preferences: 'Preferenze',
+  available_in_pro: 'Disponibile in Pro',
+  some_fields_are_missing_in_the_formula: 'Alcuni campi mancano nella formula.',
+  learn_more: 'Scopri di più'
+}
+
+const pt = {
+  editable: 'Editável',
+  search_field: 'Campo de busca',
+  field_not_found: 'Campo não encontrado',
+  clear: 'Limpar',
+  type_value: 'Digite valor',
+  add_all_required_fields_to_continue: 'Adicione todos os campos obrigatórios para continuar',
+  uploaded_pdf_contains_form_fields_keep_or_remove_them: 'O PDF carregado contém campos. Manter ou removê-los?',
+  keep: 'Manter',
+  align: 'Alinhar',
+  left: 'Esquerda',
+  heading: 'Cabeçalho',
+  validation: 'Validação',
+  add_blank_page: 'Adicionar página em branco',
+  right: 'Direita',
+  center: 'Centro',
+  with_logo: 'Com logotipo',
+  description: 'Descrição',
+  display_title: 'Título de exibição',
+  signing_date: 'Data da Assinatura',
+  unchecked: 'Não marcado',
+  price: 'Preço',
+  equal: 'Igual',
+  not_equal: 'Não é igual',
+  contains: 'Contém',
+  does_not_contain: 'Não contém',
+  not_empty: 'Não vazio',
+  empty: 'Vazio',
+  add_condition: 'Adicionar condição',
+  select_field_: 'Selecionar campo...',
+  select_value_: 'Selecionar valor...',
+  remove_condition: 'Remover condição',
+  condition: 'Condição',
+  formula: 'Fórmula',
+  edit: 'Editar',
+  settings: 'Configurações',
+  up: 'Para cima',
+  down: 'Para baixo',
+  set_signing_date: 'Definir data de assinatura',
+  are_you_sure: 'Tem certeza?',
+  sign_yourself: 'Assine você mesmo',
+  checked: 'Marcado',
+  send: 'Enviar',
+  remove: 'Remover',
+  save: 'Salvar',
+  cancel: 'Cancelar',
+  or_add_field_without_drawing: 'Ou adicione campo sem desenhar',
+  draw_field_on_the_document: 'Desenhar campo {field} no documento',
+  click_to_upload: 'Clique para enviar',
+  or_drag_and_drop_files: 'ou arraste e solte arquivos',
+  uploading: 'Carregando',
+  processing_: 'Processando...',
+  add_pdf_documents_or_images: 'Adicionar documentos PDF ou imagens',
+  add_documents_or_images: 'Adicionar documentos ou imagens',
+  required: 'Obrigatório',
+  default_value: 'Valor padrão',
+  format: 'Formato',
+  read_only: 'Somente leitura',
+  page: 'Página',
+  draw_new_area: 'Desenhar nova área',
+  copy_to_all_pages: 'Copiar para todas as páginas',
+  add_option: 'Adicionar opção',
+  option: 'Opção',
+  first_party: 'Primeira Parte',
+  second_party: 'Segunda Parte',
+  third_party: 'Terceira Parte',
+  fourth_party: 'Quarta Parte',
+  fifth_party: 'Quinta Parte',
+  sixth_party: 'Sexta Parte',
+  seventh_party: 'Sétima Parte',
+  eighth_party: 'Oitava Parte',
+  ninth_party: 'Nona Parte',
+  tenth_party: 'Décima Parte',
+  eleventh_party: 'Décima Primeira Parte',
+  twelfth_party: 'Décima Segunda Parte',
+  thirteenth_party: 'Décima Terceira Parte',
+  fourteenth_party: 'Décima Quarta Parte',
+  fifteenth_party: 'Décima Quinta Parte',
+  sixteenth_party: 'Décima Sexta Parte',
+  seventeenth_party: 'Décima Sétima Parte',
+  eighteenth_party: 'Décima Oitava Parte',
+  nineteenth_party: 'Décima Nona Parte',
+  twentieth_party: 'Vigésima Parte',
+  draw: 'Desenhar',
+  add: 'Adicionar',
+  text: 'Texto',
+  signature: 'Assinatura',
+  initials: 'Rúbrica',
+  date: 'Data',
+  number: 'Número',
+  image: 'Imagem',
+  file: 'Arquivo',
+  select: 'Selecionar',
+  checkbox: 'Caixa',
+  field: 'Campo',
+  group: 'Grupo',
+  multiple: 'Múltiplo',
+  radio: 'Rádio',
+  cells: 'Células',
+  stamp: 'Carimbo',
+  payment: 'Pagamento',
+  phone: 'Telefone',
+  draw_a_text_field_on_the_page_with_a_mouse: 'Desenhar um campo de texto na página com o mouse',
+  drag_and_drop_any_other_field_type_on_the_page: 'Arraste e solte qualquer outro tipo de campo na página',
+  click_on_the_field_type_above_to_start_drawing_it: 'Clique no tipo de campo acima para começar a desenhá-lo',
+  please_draw_fields_to_prepare_the_document: 'Por favor, desenhe os campos para preparar o documento.',
+  only_pdf_and_images_are_supported: 'Apenas PDFs e imagens são suportados.',
+  unlock_sms_verified_phone_number_field_with_paid_plan_use_text_field_for_phone_numbers_without_verification: 'Desbloqueie o campo de número de telefone verificado por SMS com um plano pago. Use o campo de texto para números de telefone sem verificação.',
+  available_only_in_pro: 'Disponível apenas no Pro',
+  failed_to_download_files: 'Falha ao baixar arquivos',
+  signature_is_too_small_please_redraw: 'A assinatura é muito pequena. Por favor, redesenhe.',
+  please_add_fields_for_the_submitter_name_or_remove_the_submitter_name_if_not_needed: 'Adicione campos para {submitter_name} ou remova {submitter_name} se não for necessário.',
+  draw_field: 'Desenhar campo {field}',
+  replace: 'Substituir',
+  uploading_: 'Carregando...',
+  add_document: 'Enviar',
+  any: 'Qualquer',
+  drawn: 'Desenhado',
+  typed: 'Digitado',
+  none: 'Nenhum',
+  ssn: 'SSN',
+  ein: 'EIN',
+  email: 'Email',
+  url: 'URL',
+  zip: 'ZIP',
+  custom: 'Personalizado',
+  numbers_only: 'Somente números',
+  letters_only: 'Somente letras',
+  regexp_validation: 'Validação de expressão regular',
+  enter_pdf_password: 'Digite a senha do PDF',
+  wrong_password: 'Senha incorreta',
+  currency: 'Moeda',
+  save_and_preview: 'Salvar e Pré-visualizar',
+  preferences: 'Preferências',
+  available_in_pro: 'Disponível no Pro',
+  some_fields_are_missing_in_the_formula: 'Faltam alguns campos na fórmula.',
+  learn_more: 'Saiba mais'
+}
+
+const fr = {
+  editable: 'Éditable',
+  search_field: 'Champ de recherche',
+  field_not_found: 'Champ non trouvé',
+  clear: 'Effacer',
+  type_value: 'Tapez la valeur',
+  add_all_required_fields_to_continue: 'Ajoutez tous les champs obligatoires pour continuer',
+  uploaded_pdf_contains_form_fields_keep_or_remove_them: 'Le PDF téléchargé contient des champs. Les conserver ou les supprimer?',
+  keep: 'Conserver',
+  align: 'Aligner',
+  left: 'Gauche',
+  heading: 'En-tête',
+  validation: 'Validation',
+  add_blank_page: 'Ajouter une page blanche',
+  right: 'Droite',
+  add_condition: 'Ajouter une condition',
+  center: 'Centre',
+  with_logo: 'Avec logo',
+  description: 'Description',
+  display_title: "Titre d'affichage",
+  unchecked: 'Non coché',
+  price: 'Prix',
+  equal: 'Égal',
+  not_equal: 'Non égal',
+  contains: 'Contient',
+  signing_date: 'Date de signature',
+  does_not_contain: 'Ne contient pas',
+  not_empty: 'Non vide',
+  empty: 'Vide',
+  select_field_: 'Sélectionner un champ...',
+  select_value_: 'Sélectionner une valeur...',
+  remove_condition: 'Supprimer la condition',
+  condition: 'Condition',
+  formula: 'Formule',
+  edit: 'Éditer',
+  settings: 'Paramètres',
+  up: 'Haut',
+  down: 'Bas',
+  set_signing_date: 'Définir la date de signature',
+  are_you_sure: 'Êtes-vous sûr ?',
+  sign_yourself: 'Signez-vous',
+  checked: 'Coché',
+  send: 'Envoyer',
+  remove: 'Supprimer',
+  save: 'Enregistrer',
+  cancel: 'Annuler',
+  draw_field_on_the_document: 'Dessinez le champ {field} sur le document',
+  click_to_upload: 'Cliquez pour télécharger',
+  or_drag_and_drop_files: 'ou faites glisser-déposer des fichiers',
+  uploading: 'Téléchargement en cours',
+  processing_: 'Traitement en cours...',
+  add_pdf_documents_or_images: 'Ajoutez des documents PDF ou des images',
+  add_documents_or_images: 'Ajoutez des documents ou des images',
+  required: 'Requis',
+  default_value: 'Valeur par défaut',
+  format: 'Format',
+  read_only: 'Lecture seule',
+  page: 'Page',
+  draw_new_area: 'Dessiner une nouvelle zone',
+  copy_to_all_pages: 'Copier sur toutes les pages',
+  add_option: 'Ajouter une option',
+  option: 'Option',
+  first_party: 'Première partie',
+  second_party: 'Deuxième partie',
+  third_party: 'Troisième partie',
+  fourth_party: 'Quatrième partie',
+  fifth_party: 'Cinquième partie',
+  sixth_party: 'Sixième partie',
+  seventh_party: 'Septième partie',
+  eighth_party: 'Huitième partie',
+  ninth_party: 'Neuvième partie',
+  tenth_party: 'Dixième partie',
+  eleventh_party: 'Onzième Parti',
+  twelfth_party: 'Douzième Parti',
+  thirteenth_party: 'Treizième Parti',
+  fourteenth_party: 'Quatorzième Parti',
+  fifteenth_party: 'Quinzième Parti',
+  sixteenth_party: 'Seizième Parti',
+  seventeenth_party: 'Dix-septième Parti',
+  eighteenth_party: 'Dix-huitième Parti',
+  nineteenth_party: 'Dix-Neuvième Fête',
+  twentieth_party: 'Vingtième Fête',
+  draw: 'Dessiner',
+  add: 'Ajouter',
+  or_add_field_without_drawing: 'Ou ajoutez un champ sans dessiner',
+  text: 'Texte',
+  signature: 'Signature',
+  initials: 'Initiales',
+  date: 'Date',
+  number: 'Numéro',
+  image: 'Image',
+  file: 'Fichier',
+  select: 'Choisir',
+  checkbox: 'Coche',
+  multiple: 'Multiple',
+  radio: 'Radio',
+  cells: 'Cellules',
+  stamp: 'Tampon',
+  payment: 'Paiement',
+  phone: 'Téléphone',
+  field: 'Champ',
+  group: 'Groupe',
+  draw_a_text_field_on_the_page_with_a_mouse: 'Dessinez un champ texte sur la page avec une souris',
+  drag_and_drop_any_other_field_type_on_the_page: 'Glissez et déposez tout autre type de champ sur la page',
+  click_on_the_field_type_above_to_start_drawing_it: 'Cliquez sur le type de champ ci-dessus pour commencer à le dessiner',
+  please_draw_fields_to_prepare_the_document: 'Veuillez dessiner les champs pour préparer le document.',
+  only_pdf_and_images_are_supported: 'Seuls les PDF et les images sont pris en charge.',
+  unlock_sms_verified_phone_number_field_with_paid_plan_use_text_field_for_phone_numbers_without_verification: 'Débloquez le champ de numéro de téléphone vérifié par SMS avec un plan payant. Utilisez un champ texte pour les numéros de téléphone sans vérification.',
+  available_only_in_pro: 'Disponible uniquement en Pro',
+  failed_to_download_files: 'Échec du téléchargement des fichiers',
+  signature_is_too_small_please_redraw: 'La signature est trop petite. Veuillez la redessiner.',
+  please_add_fields_for_the_submitter_name_or_remove_the_submitter_name_if_not_needed: 'Veuillez ajouter des champs pour {submitter_name} ou retirer {submitter_name} si ce n\'est pas nécessaire.',
+  draw_field: 'Dessiner le champ {field}',
+  replace: 'Remplacer',
+  uploading_: 'Téléchargement en cours...',
+  add_document: 'Télécharger',
+  any: 'Tout',
+  drawn: 'Dessiné',
+  typed: 'Tapé',
+  none: 'Aucun',
+  ssn: 'SSN',
+  ein: 'EIN',
+  email: 'E-mail',
+  url: 'URL',
+  zip: 'ZIP',
+  custom: 'Personnalisé',
+  numbers_only: 'Chiffres uniquement',
+  letters_only: 'Lettres uniquement',
+  regexp_validation: 'Validation par expression régulière',
+  enter_pdf_password: 'Entrez le mot de passe PDF',
+  wrong_password: 'Mot de passe incorrect',
+  currency: 'Devise',
+  save_and_preview: 'Enregistrer et prévisualiser',
+  preferences: 'Préférences',
+  available_in_pro: 'Disponible en version Pro',
+  some_fields_are_missing_in_the_formula: 'Certains champs manquent dans la formule.',
+  learn_more: 'En savoir plus'
+}
+
+const de = {
+  editable: 'Bearbeitbar',
+  search_field: 'Suchfeld',
+  field_not_found: 'Feld nicht gefunden',
+  clear: 'Löschen',
+  type_value: 'Wert eingeben',
+  add_all_required_fields_to_continue: 'Fügen Sie alle erforderlichen Felder hinzu, um fortzufahren',
+  uploaded_pdf_contains_form_fields_keep_or_remove_them: 'Das hochgeladene PDF enthält Formularfelder. Behalten oder entfernen?',
+  keep: 'Behalten',
+  align: 'Ausrichten',
+  left: 'Links',
+  heading: 'Überschrift',
+  validation: 'Validierung',
+  add_blank_page: 'Leere Seite hinzufügen',
+  right: 'Rechts',
+  add_condition: 'Bedingung hinzufügen',
+  center: 'Zentriert',
+  with_logo: 'Mit Logo',
+  description: 'Beschreibung',
+  display_title: 'Anzeigetitel',
+  unchecked: 'Nicht überprüft',
+  price: 'Preis',
+  equal: 'Gleich',
+  not_equal: 'Ungleich',
+  contains: 'Enthält',
+  does_not_contain: 'Enthält nicht',
+  not_empty: 'Nicht leer',
+  empty: 'Leer',
+  signing_date: 'Signaturdatum',
+  select_field_: 'Feld auswählen...',
+  select_value_: 'Wert auswählen...',
+  remove_condition: 'Bedingung entfernen',
+  condition: 'Bedingung',
+  formula: 'Formel',
+  edit: 'Bearbeiten',
+  settings: 'Einstellungen',
+  up: 'Nach oben',
+  down: 'Nach unten',
+  set_signing_date: 'Unterschriftdatum festlegen',
+  are_you_sure: 'Bist du sicher?',
+  sign_yourself: 'Unterschreiben Sie selbst',
+  checked: 'Ausgewählt',
+  send: 'Senden',
+  remove: 'Entfernen',
+  save: 'Speichern',
+  cancel: 'Abbrechen',
+  draw_field_on_the_document: 'Feld {field} auf dem Dokument zeichnen',
+  click_to_upload: 'Klicken Sie zum Hochladen',
+  or_drag_and_drop_files: 'oder Dateien hierher ziehen',
+  uploading: 'Hochladen',
+  processing_: 'Verarbeitung...',
+  add_pdf_documents_or_images: 'PDF-Dokumente oder Bilder hinzufügen',
+  add_documents_or_images: 'Dokumente oder Bilder hinzufügen',
+  required: 'Erforderlich',
+  default_value: 'Standardwert',
+  format: 'Format',
+  read_only: 'Nur lesen',
+  page: 'Seite',
+  draw_new_area: 'Neuen Bereich zeichnen',
+  copy_to_all_pages: 'Auf alle Seiten kopieren',
+  add_option: 'Option hinzufügen',
+  option: 'Option',
+  first_party: 'Erste Partei',
+  second_party: 'Zweite Partei',
+  third_party: 'Dritte Partei',
+  fourth_party: 'Vierte Partei',
+  fifth_party: 'Fünfte Partei',
+  sixth_party: 'Sechste Partei',
+  seventh_party: 'Siebte Partei',
+  eighth_party: 'Achte Partei',
+  ninth_party: 'Neunte Partei',
+  tenth_party: 'Zehnte Partei',
+  eleventh_party: 'Elfte Partei',
+  twelfth_party: 'Zwölfte Partei',
+  thirteenth_party: 'Dreizehnte Partei',
+  fourteenth_party: 'Vierzehnte Partei',
+  fifteenth_party: 'Fünfzehnte Partei',
+  sixteenth_party: 'Sechzehnte Partei',
+  seventeenth_party: 'Siebzehnte Partei',
+  eighteenth_party: 'Achtzehnte Partei',
+  nineteenth_party: 'Neunzehnte Party',
+  twentieth_party: 'Zwanzigste Party',
+  draw: 'Zeichnen',
+  add: 'Hinzufügen',
+  or_add_field_without_drawing: 'Oder Feld ohne Zeichnung hinzufügen',
+  text: 'Text',
+  signature: 'Unterschrift',
+  initials: 'Initialen',
+  date: 'Datum',
+  number: 'Nummer',
+  image: 'Bild',
+  file: 'Datei',
+  select: 'Auswählen',
+  checkbox: 'Checkbox',
+  multiple: 'Mehrere',
+  radio: 'Radio',
+  cells: 'Zellen',
+  stamp: 'Stempel',
+  payment: 'Zahlung',
+  phone: 'Telefon',
+  field: 'Feld',
+  group: 'Gruppe',
+  draw_a_text_field_on_the_page_with_a_mouse: 'Textfeld auf der Seite mit der Maus zeichnen',
+  drag_and_drop_any_other_field_type_on_the_page: 'Ziehe und lasse einen anderen Feldtyp auf die Seite fallen',
+  click_on_the_field_type_above_to_start_drawing_it: 'Klicke auf den Feldtyp oben, um mit dem Zeichnen zu beginnen',
+  please_draw_fields_to_prepare_the_document: 'Bitte zeichne Felder, um das Dokument vorzubereiten.',
+  only_pdf_and_images_are_supported: 'Nur PDFs und Bilder werden unterstützt.',
+  unlock_sms_verified_phone_number_field_with_paid_plan_use_text_field_for_phone_numbers_without_verification: 'Schalte das SMS-verifizierte Telefonnummernfeld mit einem kostenpflichtigen Plan frei. Verwende das Textfeld für Telefonnummern ohne Verifizierung.',
+  available_only_in_pro: 'Nur in Pro verfügbar',
+  failed_to_download_files: 'Fehler beim Herunterladen der Dateien',
+  signature_is_too_small_please_redraw: 'Die Unterschrift ist zu klein. Bitte erneut zeichnen.',
+  please_add_fields_for_the_submitter_name_or_remove_the_submitter_name_if_not_needed: 'Bitte füge Felder für {submitter_name} hinzu oder entferne {submitter_name}, falls nicht erforderlich.',
+  draw_field: 'Feld {field} zeichnen',
+  replace: 'Ersetzen',
+  uploading_: 'Hochladen...',
+  add_document: 'Hochladen',
+  any: 'Jede',
+  drawn: 'Gezeichnet',
+  typed: 'Getippt',
+  none: 'Keine',
+  ssn: 'SSN',
+  ein: 'EIN',
+  email: 'E-Mail',
+  url: 'URL',
+  zip: 'ZIP',
+  custom: 'Benutzerdefiniert',
+  numbers_only: 'Nur Zahlen',
+  letters_only: 'Nur Buchstaben',
+  regexp_validation: 'Regulärer Ausdruck Überprüfung',
+  enter_pdf_password: 'Geben Sie das PDF-Passwort ein',
+  wrong_password: 'Falsches Passwort',
+  currency: 'Währung',
+  save_and_preview: 'Speichern und Vorschau',
+  preferences: 'Einstellungen',
+  available_in_pro: 'In Pro verfügbar',
+  some_fields_are_missing_in_the_formula: 'Einige Felder fehlen in der Formel.',
+  learn_more: 'Erfahren Sie mehr'
+}
+
+export { en, es, it, pt, fr, de }

app/javascript/template_builder/import_list.vue

@@ -3,7 +3,7 @@
     <div v-if="selectedSheetIndex === null && spreadsheet">
       <form @submit.prevent="[selectedSheetIndex = $refs.selectWorksheet.value, buildDefaultMappings()]">
         <label class="label">
-          Select Worksheet
+          {{ t('select_worksheet') }}
         </label>
         <select
           ref="selectWorksheet"
@@ -18,7 +18,7 @@
           </option>
         </select>
         <button class="base-button mt-4 w-full">
-          Open
+          {{ t('open') }}
         </button>
       </form>
     </div>
@@ -36,10 +36,10 @@
         </div>
         <div class="flex">
           <div class="relative w-full py-2 px-2 text-sm">
-            Recipient field
+            {{ t('recipient_field') }}
           </div>
           <div class="relative w-full py-2 pl-4 text-sm">
-            Spreadsheet column
+            {{ t('spreadsheet_column') }}
           </div>
         </div>
         <div
@@ -58,7 +58,7 @@
                 value=""
                 :selected="!mapping.field_name"
               >
-                Select Field
+                {{ t('select_field') }}
               </option>
               <option
                 v-for="(field, index) in selectFieldsForSubmitter(submitter)"
@@ -83,7 +83,7 @@
                   value=""
                   :selected="mapping.column_index == null"
                 >
-                  Select Column
+                  {{ t('select_column') }}
                 </option>
                 <template
                   v-for="(column, index) in columns"
@@ -118,8 +118,8 @@
             </div>
             <div class="flex items-center pl-1">
               <span
-                class="tooltip tooltip-top"
+                class="tooltip tooltip-left"
-                data-tip="Remove"
+                :data-tip="t('remove')"
               >
                 <button
                   :disabled="mappings.filter((m) => m.submitter_uuid === submitter.uuid).length < 2"
@@ -138,7 +138,7 @@
             @click.prevent="addMapping(submitter)"
           >
             <IconPlus class="w-4 h-4" />
-            New Field Mapping
+            {{ t('new_field_mapping') }}
           </button>
         </div>
       </div>
@@ -152,7 +152,7 @@
       <div
         class="px-3 border-y py-2 border-base-300 text-center w-full text-sm font-semibold"
       >
-        Total entries: {{ submissionsData.length }}
+        {{ t('total_entries') }}: {{ submissionsData.length }}
         <template v-if="multitenant && submissionsData.length >= 1000">
           / 1000
         </template>
@@ -187,10 +187,10 @@
               <div
                 class="font-medium text-lg mb-1"
               >
-                Upload CSV or XLSX Spreadsheet
+                {{ t('upload_csv_or_xlsx_spreadsheet') }}
               </div>
               <div class="text-sm">
-                <span class="font-medium">Click to Upload</span> or drag and drop files.
+                <span class="font-medium">{{ t('click_to_upload') }}</span> {{ t('or_drag_and_drop_files') }}
               </div>
             </div>
           </div>
@@ -210,11 +210,11 @@
         </label>
       </div>
       <div class="text-center mt-2">
-        Or <a
+        {{ t('or') }} <a
           :download="`${template.name}.csv`"
           :href="`data:text/csv;base64,${csvBase64}`"
           class="link font-medium"
-        >download</a> a spreadsheet to fill and import
+        >{{ t('download') }}</a> {{ t('a_sample_spreadsheet_to_fill_and_import') }}
       </div>
     </div>
   </div>
@@ -248,6 +248,11 @@ export default {
       type: String,
       required: false,
       default: ''
+    },
+    i18n: {
+      type: Object,
+      required: false,
+      default: () => ({})
     }
   },
   data () {
@@ -354,6 +359,9 @@ export default {
     }
   },
   methods: {
+    t (key) {
+      return this.i18n[key] || key
+    },
     onDropFiles (e) {
       this.uploadFile(e.dataTransfer.files[0])
     },

app/javascript/template_builder/mobile_fields.vue

@@ -52,7 +52,7 @@
       </template>
       <template v-else>
         <template
-          v-for="(icon, type) in fieldIcons"
+          v-for="(icon, type) in fieldIconsSorted"
           :key="type"
         >
           <li v-if="(fieldTypes.length === 0 || fieldTypes.includes(type)) && (withPhone || type != 'phone') && (withPayment || type != 'payment')">

app/javascript/template_builder/page.vue

@@ -21,8 +21,10 @@
         :key="i"
         :ref="setAreaRefs"
         :area="item.area"
+        :input-mode="inputMode"
         :field="item.field"
         :editable="editable"
+        :with-field-placeholder="withFieldPlaceholder"
         :default-field="defaultFields.find((f) => f.name === item.field.name)"
         :default-submitters="defaultSubmitters"
         @start-resize="resizeDirection = $event"
@@ -71,11 +73,21 @@ export default {
       required: false,
       default: () => []
     },
+    inputMode: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     defaultFields: {
       type: Array,
       required: false,
       default: () => []
     },
+    withFieldPlaceholder: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     drawFieldType: {
       type: String,
       required: false,

app/javascript/template_builder/payment_settings.vue

@@ -1,7 +1,7 @@
 <template>
   <span
     class="dropdown dropdown-end"
-    :class="{ 'dropdown-open': (!field.preferences?.price || !isConnected) && !isLoading }"
+    :class="{ 'dropdown-open': ((!field.preferences?.price && !field.preferences?.formula) || !isConnected) && !isLoading }"
   >
     <label
       tabindex="0"
@@ -26,7 +26,7 @@
       >
         <select
           v-model="field.preferences.currency"
-          placeholder="Price"
+          :placeholder="t('price')"
           class="select select-bordered select-xs font-normal w-full max-w-xs !h-7 !outline-0"
           @change="save"
         >
@@ -43,7 +43,7 @@
           class="absolute -top-1 left-2.5 px-1 h-4"
           style="font-size: 8px"
         >
-          Currency
+          {{ t('currency') }}
         </label>
       </div>
       <div
@@ -51,19 +51,28 @@
         @click.stop
       >
         <input
+          v-if="field.preferences.formula"
+          type="number"
+          :placeholder="t('price')"
+          disabled="true"
+          class="input input-bordered input-xs w-full max-w-xs h-7 !outline-0"
+          @blur="save"
+        >
+        <input
+          v-else
           v-model="field.preferences.price"
           type="number"
-          placeholder="Price"
+          :placeholder="t('price')"
           class="input input-bordered input-xs w-full max-w-xs h-7 !outline-0"
           @blur="save"
         >
         <label
-          v-if="field.preferences.price"
+          v-if="field.preferences.price && !field.preferences.formula"
           :style="{ backgroundColor: backgroundColor }"
           class="absolute -top-1 left-2.5 px-1 h-4"
           style="font-size: 8px"
         >
-          Price
+          {{ t('price') }}
         </label>
       </div>
       <div
@@ -147,10 +156,23 @@
           href="https://www.docuseal.co/blog/accept-payments-and-request-signatures-with-ease"
           target="_blank"
           data-turbo="false"
-        >Learn more</a>
+        >{{ t('learn_more') }}</a>
       </div>
+      <li class="mb-1">
+        <label
+          class="label-text cursor-pointer text-center w-full flex items-center"
+          @click="$emit('click-formula')"
+        >
+          <IconMathFunction
+            width="18"
+          />
+          <span class="text-sm">
+            {{ t('formula') }}
+          </span>
+        </label>
+      </li>
       <hr>
-      <li class="mt-1">
+      <li>
         <label
           class="label-text cursor-pointer text-center w-full flex items-center"
           @click="$emit('click-description')"
@@ -181,7 +203,7 @@
 </template>
 
 <script>
-import { IconSettings, IconCircleCheck, IconInfoCircle, IconBrandStripe, IconInnerShadowTop, IconRouteAltLeft } from '@tabler/icons-vue'
+import { IconMathFunction, IconSettings, IconCircleCheck, IconInfoCircle, IconBrandStripe, IconInnerShadowTop, IconRouteAltLeft } from '@tabler/icons-vue'
 import { ref } from 'vue'
 
 const isConnected = ref(false)
@@ -193,6 +215,7 @@ export default {
     IconCircleCheck,
     IconRouteAltLeft,
     IconInfoCircle,
+    IconMathFunction,
     IconInnerShadowTop,
     IconBrandStripe
   },
@@ -203,7 +226,7 @@ export default {
       required: true
     }
   },
-  emits: ['click-condition', 'click-description'],
+  emits: ['click-condition', 'click-description', 'click-formula'],
   data () {
     return {
       isLoading: false

app/javascript/template_builder/upload.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <label
+      id="add_document_button"
       :for="inputId"
       class="btn btn-outline w-full"
       :class="{ 'btn-disabled': isLoading || isProcessing }"
@@ -89,10 +90,10 @@ export default {
           })
         } else if (resp.status === 422) {
           resp.json().then((data) => {
-            if (data.error === 'PDF encrypted') {
+            if (data.status === 'pdf_encrypted') {
               const formData = new FormData(this.$refs.form)
 
-              formData.append('password', prompt('Enter PDF password'))
+              formData.append('password', prompt(this.t('enter_pdf_password')))
 
               this.baseFetch(`/templates/${this.templateId}/documents`, {
                 method: 'POST',
@@ -102,7 +103,7 @@ export default {
                   this.$emit('success', await resp.json())
                   this.$refs.input.value = ''
                 } else {
-                  alert('Wrong password')
+                  alert(this.t('wrong_password'))
                 }
               })
             }

app/jobs/process_submitter_completion_job.rb

@@ -15,14 +15,47 @@ class ProcessSubmitterCompletionJob
     Submissions::EnsureResultGenerated.call(submitter)
 
     if is_all_completed && submitter.completed_at == submitter.submission.submitters.maximum(:completed_at)
+      if submitter.submission.account.account_configs.exists?(key: AccountConfig::COMBINE_PDF_RESULT_KEY, value: true)
+        Submissions::GenerateCombinedAttachment.call(submitter)
+      end
+
       Submissions::GenerateAuditTrail.call(submitter.submission)
 
       enqueue_completed_emails(submitter)
     end
 
-    return if Accounts.load_webhook_url(submitter.account).blank?
+    enqueue_completed_webhooks(submitter, is_all_completed:)
+  end
 
-    SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id })
+  def enqueue_completed_webhooks(submitter, is_all_completed: false)
+    webhook_config = Accounts.load_webhook_config(submitter.account)
+
+    if webhook_config
+      SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
+                                                         'encrypted_config_id' => webhook_config.id })
+    end
+
+    webhook_urls = submitter.account.webhook_urls
+
+    webhook_urls = webhook_urls.where(
+      Arel::Table.new(:webhook_urls)[:events].matches('%"form.completed"%')
+    ).or(
+      webhook_urls.where(
+        Arel::Table.new(:webhook_urls)[:events].matches('%"submission.completed"%')
+      )
+    )
+
+    webhook_urls.each do |webhook|
+      if webhook.events.include?('form.completed')
+        SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
+                                                           'webhook_url_id' => webhook.id })
+      end
+
+      if webhook.events.include?('submission.completed') && is_all_completed
+        SendSubmissionCompletedWebhookRequestJob.perform_async({ 'submission_id' => submitter.submission_id,
+                                                                 'webhook_url_id' => webhook.id })
+      end
+    end
   end
 
   def enqueue_completed_emails(submitter)