fix i18n typos

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

@@ -34,6 +34,7 @@ Metrics/MethodLength:
   Max: 30
   Exclude:
     - 'db/migrate/**'
+    - 'spec/**/*'
 
 Metrics/CyclomaticComplexity:
   Max: 15
@@ -46,6 +47,8 @@ Layout/LineLength:
 
 Metrics/AbcSize:
   Max: 45
+  Exclude:
+    - spec/**/*
 
 Metrics/ModuleLength:
   Max: 500
@@ -65,6 +68,9 @@ RSpec/ExampleLength:
 RSpec/MultipleMemoizedHelpers:
   Max: 6
 
+Metrics/BlockNesting:
+  Max: 4
+
 Rails/I18nLocaleTexts:
   Enabled: false
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.3.3-alpine as fonts
+FROM ruby:3.3.4-alpine as fonts
 
 WORKDIR /fonts
 
@@ -6,7 +6,7 @@ RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-
 
 RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'
 
-FROM ruby:3.3.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,7 +2,7 @@
 
 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
@@ -23,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

@@ -165,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)
@@ -269,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)
@@ -312,7 +312,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.24.1)
+    minitest (5.25.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.4.0)
@@ -324,11 +324,12 @@ GEM
       date
       net-protocol
     net-pop (0.1.2)
+      net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.4.0)
       net-protocol
-    nio4r (2.7.1)
+    nio4r (2.7.3)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -366,7 +367,7 @@ 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.1)
     rack (3.1.7)
@@ -417,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.2)
       connection_pool
     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)
@@ -434,7 +435,7 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.3.3)
+    rexml (3.3.6)
       strscan
     rotp (6.3.0)
     rqrcode (2.2.0)
@@ -515,11 +516,11 @@ 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)
     strscan (3.1.0)
-    thor (1.3.1)
+    thor (1.3.2)
     timeout (0.4.1)
     trailblazer-option (0.1.2)
     turbo-rails (2.0.5)
@@ -554,7 +555,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
@@ -591,6 +592,7 @@ DEPENDENCIES
   letter_opener_web
   lograge
   mysql2
+  net-smtp (= 0.4.0)
   oj
   pagy
   pg
@@ -623,7 +625,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.3.3p89
+   ruby 3.3.4p94
 
 BUNDLED WITH
    2.5.3

app/controllers/account_configs_controller.rb

@@ -15,6 +15,7 @@ class AccountConfigsController < ApplicationController
     AccountConfig::FORCE_SSO_AUTH_KEY,
     AccountConfig::FLATTEN_RESULT_PDF_KEY,
     AccountConfig::WITH_SIGNATURE_ID,
+    AccountConfig::COMBINE_PDF_RESULT_KEY,
     AccountConfig::REQUIRE_SIGNING_REASON_KEY
   ].freeze
 

app/controllers/accounts_controller.rb

@@ -24,7 +24,7 @@ class AccountsController < ApplicationController
     @encrypted_config.assign_attributes(app_url_params)
 
     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
     end
@@ -33,7 +33,7 @@ class AccountsController < ApplicationController
 
     Docuseal.refresh_default_url_options!
 
-    redirect_to settings_account_path, notice: 'Account information has been updated'
+    redirect_to settings_account_path, notice: I18n.t('account_information_has_been_updated')
   rescue ActiveRecord::RecordInvalid
     render :show, status: :unprocessable_entity
   end
@@ -43,11 +43,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/form_events_controller.rb

@@ -11,7 +11,8 @@ module Api
       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 }],
+        submitters.preload(template: :folder, submission: [:submitters, { audit_trail_attachment: :blob,
+                                                                          combined_document_attachment: :blob }],
                            documents_attachments: :blob, attachments_attachments: :blob),
         field: :completed_at
       )

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,
@@ -76,7 +80,7 @@ module Api
       end
 
       render json: build_create_json(submissions)
-    rescue Submitters::NormalizeValues::BaseError => e
+    rescue Submitters::NormalizeValues::BaseError, DownloadUtils::UnableToDownload => e
       Rollbar.warning(e) if defined?(Rollbar)
 
       render json: { error: e.message }, status: :unprocessable_entity
@@ -154,7 +158,7 @@ module Api
                         :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

@@ -77,6 +77,10 @@ module Api
                                                                 with_urls: true,
                                                                 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
@@ -87,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_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_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

@@ -79,7 +79,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/esign_settings_controller.rb

@@ -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)
 
@@ -73,7 +73,7 @@ class EsignSettingsController < ApplicationController
 
     @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 +81,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
@@ -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,30 +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(expire_at: Time.current..)
+    @submitter = find_or_initialize_submitter(@template, submitter_params)
-                                             .or(@template.submissions.where(expire_at: nil)).where(archived_at: nil))
-                          .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
@@ -56,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) || {},
@@ -80,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

@@ -49,7 +49,7 @@ 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
@@ -57,13 +57,13 @@ class SubmissionsController < ApplicationController
       if params[:permanently].present?
         @submission.destroy!
 
-        'Submission has been removed'
+        I18n.t('submission_has_been_removed')
       else
         @submission.update!(archived_at: Time.current)
 
         SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)
 
-        'Submission has been archived'
+        I18n.t('submission_has_been_archived')
       end
 
     redirect_back(fallback_location: template_path(@submission.template), notice:)

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

@@ -15,6 +15,7 @@ class SubmitFormController < ApplicationController
     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 :expired if @submitter.submission.expired?
+    return render :declined if @submitter.declined_at?
 
     Submitters.preload_with_pages(@submitter)
 
@@ -45,15 +46,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?
-      return render json: { error: 'Form has been archived.' }, status: :unprocessable_entity
+      return render json: { error: I18n.t('form_has_been_archived') }, status: :unprocessable_entity
     end
 
     if submitter.submission.expired?
-      return render json: { error: 'Form has been expired.' }, status: :unprocessable_entity
+      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,8 +7,10 @@ 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?

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,7 +21,7 @@ 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
@@ -87,11 +87,11 @@ class TemplatesController < ApplicationController
       if params[:permanently].present?
         @template.destroy!
 
-        'Template has been removed.'
+        I18n.t('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:)
@@ -103,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,
@@ -123,7 +123,7 @@ class TemplatesController < ApplicationController
     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_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
@@ -23,12 +23,16 @@ class TemplatesPreferencesController < ApplicationController
                       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
                       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

@@ -33,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
@@ -52,7 +52,7 @@ 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(
@@ -65,10 +65,4 @@ class TemplatesUploadsController < ApplicationController
 
     { 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

@@ -14,6 +14,6 @@ class VerifyPdfSignatureController < ApplicationController
     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

@@ -13,7 +13,7 @@ class WebhookSecretController < ApplicationController
 
     @encrypted_config.value.present? ? @encrypted_config.save! : @encrypted_config.delete
 
-    redirect_back(fallback_location: settings_webhooks_path, notice: 'Webhook Secret has been saved.')
+    redirect_back(fallback_location: settings_webhooks_path, notice: I18n.t('webhook_secret_has_been_saved'))
   end
 
   private

app/controllers/webhook_settings_controller.rb

@@ -11,7 +11,7 @@ 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
@@ -20,7 +20,7 @@ class WebhookSettingsController < ApplicationController
     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

@@ -25,6 +25,10 @@ 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'
 
@@ -87,9 +91,15 @@ 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')
@@ -105,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()
   }

app/javascript/application.scss

@@ -51,6 +51,10 @@ button[disabled] .enabled {
   @apply input input-bordered bg-white;
 }
 
+.base-input-slim {
+  @apply input input-bordered bg-white h-10;
+}
+
 .base-textarea {
   @apply textarea textarea-bordered bg-white rounded-3xl;
 }
@@ -100,7 +104,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 +115,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/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,6 +14,7 @@ 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',

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,7 +3,7 @@
     class="field-area flex absolute lg:text-base -outline-offset-1"
     dir="auto"
     :style="computedStyle"
-    :class="{ '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 }"
+    :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="(!withFieldPlaceholder || !field.name || field.type === 'cells') && !isActive && !isValueSet && field.type !== 'checkbox' && submittable && !area.option_uuid"
@@ -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>
@@ -226,7 +226,8 @@ export default {
     },
     submitter: {
       type: Object,
-      required: true
+      required: false,
+      default: () => ({})
     },
     withSignatureId: {
       type: Boolean,

app/javascript/submission_form/areas.vue

@@ -21,14 +21,14 @@
             :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 && !withFieldPlaceholder"
+            :with-label="withLabel && !withFieldPlaceholder && step.length < 2"
             :is-value-set="step.some((f) => f.uuid in values)"
             :attachments-index="attachmentsIndex"
             @click="$emit('focus-step', stepIndex)"
@@ -58,6 +58,11 @@ export default {
       required: false,
       default: false
     },
+    submittable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     submitter: {
       type: Object,
       required: true
@@ -127,10 +132,18 @@ export default {
           this.scrollInContainer(areaRef.$el)
         } else {
           const targetRect = areaRef.$refs.scrollToElem.getBoundingClientRect()
-          const root = this.$root.$el?.parentNode?.classList?.contains('ds') ? this.$root.$el : document.body
-          const rootRect = root.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' })
         }
 

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 () {

app/javascript/submission_form/form.vue

@@ -13,6 +13,12 @@
     :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"
@@ -32,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"
@@ -53,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"
@@ -64,7 +73,7 @@
       :class="{ 'md:px-4': isBreakpointMd }"
     >
       <form
-        v-if="!isCompleted"
+        v-if="!isCompleted && !isInvite"
         ref="form"
         :action="submitPath"
         method="post"
@@ -195,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
@@ -259,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"
@@ -334,7 +343,7 @@
             :remember-signature="rememberSignature"
             :attachments-index="attachmentsIndex"
             :require-signing-reason="requireSigningReason"
-            :button-text="buttonText"
+            :button-text="submitButtonText"
             :dry-run="dryRun"
             :with-disclosure="withDisclosure"
             :with-qr-button="withQrButton"
@@ -343,7 +352,7 @@
             @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'"
@@ -359,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'"
@@ -415,7 +424,7 @@
                 class="mr-1 animate-spin"
               />
               <span>
-                {{ buttonText }}
+                {{ submitButtonText }}
               </span><span
                 v-if="isSubmitting"
                 class="w-6 flex justify-start mr-1"
@@ -430,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"
@@ -479,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'
@@ -516,6 +537,7 @@ export default {
     IconWritingSign,
     AttachmentStep,
     InitialsStep,
+    InviteForm,
     MultiSelectStep,
     IconInnerShadowTop,
     DateStep,
@@ -542,6 +564,11 @@ export default {
       type: Object,
       required: true
     },
+    inviteSubmitters: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
     withSignatureId: {
       type: Boolean,
       required: false,
@@ -733,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,
@@ -748,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')
       }
@@ -758,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] || []
     },
@@ -802,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]
@@ -879,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)) {
@@ -925,7 +975,7 @@ export default {
         return field.conditions.reduce((acc, c) => {
           const field = this.fieldsUuidIndex[c.field_uuid]
 
-          if (['not_empty', 'checked', 'equal', 'contains'].includes(c.action) && !this.checkFieldConditions(field)) {
+          if (['not_empty', 'checked', 'equal', 'contains'].includes(c.action) && field && !this.checkFieldConditions(field)) {
             return false
           }
 
@@ -933,12 +983,12 @@ export default {
             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 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 option = field.options.find((o) => o.uuid === c.value)
             const values = [this.values[c.field_uuid]].flat()
 
@@ -1110,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')
         }
 
@@ -1141,7 +1191,7 @@ export default {
 
           if (nextStep) {
             if (this.alwaysMinimize) {
-              this.isFormVisible = false
+              this.minimizeForm()
             }
 
             this.goToStep(this.stepFields.indexOf(nextStep), this.autoscrollFields)
@@ -1149,18 +1199,10 @@ export default {
             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)
@@ -1176,6 +1218,25 @@ export default {
       }).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',
@@ -10,6 +12,8 @@ const en = {
   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',
@@ -36,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',
@@ -57,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',
@@ -85,6 +92,10 @@ const en = {
 }
 
 const es = {
+  complete: 'Completar',
+  sign_and_complete: 'Firmar y Completar',
+  invite: 'Invitar',
+  email: 'Correo electrónico',
   approved: 'Aprobado',
   reviewed: 'Revisado',
   other: 'Otro',
@@ -122,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',
@@ -142,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',
@@ -170,6 +184,10 @@ const es = {
 }
 
 const it = {
+  complete: 'Completa',
+  sign_and_complete: 'Firma e Completa',
+  invite: 'Invita',
+  email: 'Email',
   approved: 'Approvato',
   reviewed: 'Revisionato',
   other: 'Altro',
@@ -206,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',
@@ -227,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',
@@ -255,6 +276,10 @@ 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',
@@ -291,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',
@@ -312,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',
@@ -340,6 +368,10 @@ const de = {
 }
 
 const fr = {
+  complete: 'Terminer',
+  sign_and_complete: 'Signer et Terminer',
+  invite: 'Inviter',
+  email: 'Courriel',
   approved: 'Approuvé',
   reviewed: 'Révisé',
   other: 'Autre',
@@ -376,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',
@@ -397,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',
@@ -425,6 +460,10 @@ 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',
@@ -461,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',
@@ -482,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',
@@ -510,6 +552,10 @@ const pl = {
 }
 
 const uk = {
+  complete: 'Завершити',
+  sign_and_complete: 'Підписати і завершити',
+  invite: 'Запросити',
+  email: 'Електронна пошта',
   approved: 'Затверджено',
   reviewed: 'Переглянуто',
   other: 'Інше',
@@ -546,7 +592,8 @@ const uk = {
   payment: 'Платіж',
   number_phone_is_invalid: '{number} телефон недійсний',
   phone: 'Телефон',
-  submit_form: 'Надіслати Форму',
+  start_now: 'Почати зараз',
+  continue: 'Продовжити',
   sign_now: 'Підписати зараз',
   type_here_: 'Введіть тут',
   optional: 'необов’язково',
@@ -567,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: 'Підтвердіть номер телефону',
@@ -595,6 +644,10 @@ 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é',
@@ -631,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é',
@@ -652,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',
@@ -680,6 +736,10 @@ const cs = {
 }
 
 const pt = {
+  complete: 'Completar',
+  sign_and_complete: 'Assinar e Completar',
+  invite: 'Convidar',
+  email: 'E-mail',
   approved: 'Aprovado',
   reviewed: 'Revisado',
   other: 'Outro',
@@ -716,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',
@@ -737,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',
@@ -765,6 +828,10 @@ const pt = {
 }
 
 const he = {
+  complete: 'השלם',
+  sign_and_complete: 'חתום והשלם',
+  invite: 'הזמן',
+  email: 'דוא"ל',
   approved: 'מאושר',
   reviewed: 'נסקר',
   other: 'אחר',
@@ -801,7 +868,8 @@ const he = {
   payment: 'תשלום',
   phone: 'טלפון',
   number_phone_is_invalid: '{number} טלפון אינו חוקי',
-  submit_form: 'שלח טופס',
+  start_now: 'התחל עכשיו',
+  continue: 'המשך',
   sign_now: 'חתום כעת',
   type_here_: 'הקלד כאן',
   optional: 'אופציונלי',
@@ -823,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: 'אימות מספר טלפון',
@@ -851,6 +921,10 @@ const he = {
 }
 
 const nl = {
+  complete: 'Voltooien',
+  sign_and_complete: 'Ondertekenen en voltooien',
+  invite: 'Uitnodigen',
+  email: 'E-mail',
   approved: 'Goedgekeurd',
   reviewed: 'Beoordeeld',
   other: 'Anders',
@@ -888,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',
@@ -909,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',
@@ -937,6 +1014,10 @@ const nl = {
 }
 
 const ar = {
+  complete: 'اكتمال',
+  sign_and_complete: 'التوقيع والاكتمال',
+  invite: 'دعوة',
+  email: 'البريد الإلكتروني',
   approved: 'موافق عليه',
   reviewed: 'تمت مراجعته',
   other: 'آخر',
@@ -973,7 +1054,8 @@ const ar = {
   payment: 'الدفع',
   phone: 'هاتف',
   number_phone_is_invalid: '{number} هاتف غير صالح',
-  submit_form: 'إرسال النموذج',
+  start_now: 'ابدأ الآن',
+  continue: 'متابعة',
   sign_now: 'وقع الآن',
   type_here_: 'اكتب هنا',
   optional: 'اختياري',
@@ -994,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: 'تحقق من رقم الهاتف',
@@ -1022,6 +1106,10 @@ const ar = {
 }
 
 const ko = {
+  complete: '완료',
+  sign_and_complete: '서명하고 완료하기',
+  invite: '초대하기',
+  email: '이메일',
   approved: '승인됨',
   reviewed: '검토됨',
   other: '기타',
@@ -1057,7 +1145,8 @@ const ko = {
   payment: '결제',
   phone: '전화',
   number_phone_is_invalid: '{number} 전화번호가 유효하지 않습니다',
-  submit_form: '양식 제출',
+  start_now: '지금 시작하기',
+  continue: '계속하다',
   sign_now: '지금 서명',
   type_here_: '여기에 입력...',
   optional: '선택 사항',
@@ -1078,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/signature_step.vue

@@ -569,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()
 
@@ -580,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
@@ -615,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/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>
@@ -402,7 +415,7 @@ import Contenteditable from './contenteditable'
 import DocumentPreview from './preview'
 import DocumentControls from './controls'
 import MobileFields from './mobile_fields'
-import { IconPlus, 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'
@@ -426,6 +439,7 @@ export default {
     Contenteditable,
     IconUsersPlus,
     IconChevronDown,
+    IconAdjustments,
     IconEye,
     IconDeviceFloppy
   },
@@ -479,6 +493,16 @@ export default {
       required: false,
       default: true
     },
+    withSendButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    withSignYourselfButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     inputMode: {
       type: Boolean,
       required: false,
@@ -758,6 +782,9 @@ export default {
     this.documentRefs = []
   },
   methods: {
+    closeDropdown () {
+      document.activeElement.blur()
+    },
     t (key) {
       return this.i18n[key] || i18nEn[key] || key
     },

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

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
@@ -201,7 +201,7 @@ export default {
       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
 

app/javascript/template_builder/i18n.js

@@ -117,7 +117,15 @@ 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 }

app/javascript/template_builder/import_list.vue

@@ -119,7 +119,7 @@
             <div class="flex items-center pl-1">
               <span
                 class="tooltip tooltip-top"
-                data-tip="Remove"
+                data-tip="<%= t('remove') %>"
               >
                 <button
                   :disabled="mappings.filter((m) => m.submitter_uuid === submitter.uuid).length < 2"

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

@@ -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
@@ -156,7 +156,7 @@
           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

app/javascript/template_builder/upload.vue

@@ -90,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',
@@ -103,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,15 +15,19 @@ 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
 
-    enqueue_completed_webhooks(submitter)
+    enqueue_completed_webhooks(submitter, is_all_completed:)
   end
 
-  def enqueue_completed_webhooks(submitter)
+  def enqueue_completed_webhooks(submitter, is_all_completed: false)
     webhook_config = Accounts.load_webhook_config(submitter.account)
 
     if webhook_config
@@ -31,13 +35,26 @@ class ProcessSubmitterCompletionJob
                                                          'encrypted_config_id' => webhook_config.id })
     end
 
-    webhook_ids = submitter.account.webhook_urls.where(
+    webhook_urls = submitter.account.webhook_urls
-      Arel::Table.new(:webhook_urls)[:events].matches('%"form.completed"%')
-    ).pluck(:id)
 
-    webhook_ids.each do |webhook_id|
+    webhook_urls = webhook_urls.where(
-      SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
+      Arel::Table.new(:webhook_urls)[:events].matches('%"form.completed"%')
-                                                         'webhook_url_id' => webhook_id })
+    ).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
 

app/jobs/send_form_declined_webhook_request_job.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+class SendFormDeclinedWebhookRequestJob
+  include Sidekiq::Job
+
+  sidekiq_options queue: :webhooks
+
+  USER_AGENT = 'DocuSeal.co Webhook'
+
+  MAX_ATTEMPTS = 10
+
+  def perform(params = {})
+    submitter = Submitter.find(params['submitter_id'])
+
+    attempt = params['attempt'].to_i
+    config = Accounts.load_webhook_config(submitter.submission.account)
+    url = config&.value.presence
+
+    return if url.blank?
+
+    preferences = Accounts.load_webhook_preferences(submitter.submission.account)
+
+    return if preferences['form.declined'] == false
+
+    ActiveStorage::Current.url_options = Docuseal.default_url_options
+
+    resp = begin
+      Faraday.post(url,
+                   {
+                     event_type: 'form.declined',
+                     timestamp: Time.current,
+                     data: Submitters::SerializeForWebhook.call(submitter)
+                   }.to_json,
+                   **EncryptedConfig.find_or_initialize_by(account_id: config.account_id,
+                                                           key: EncryptedConfig::WEBHOOK_SECRET_KEY)&.value.to_h,
+                   'Content-Type' => 'application/json',
+                   'User-Agent' => USER_AGENT)
+    rescue Faraday::Error
+      nil
+    end
+
+    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
+       (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
+      SendFormDeclinedWebhookRequestJob.perform_in((2**attempt).minutes, {
+                                                     'submitter_id' => submitter.id,
+                                                     'attempt' => attempt + 1,
+                                                     'last_status' => resp&.status.to_i
+                                                   })
+    end
+  end
+end

app/jobs/send_submission_completed_webhook_request_job.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class SendSubmissionCompletedWebhookRequestJob
+  include Sidekiq::Job
+
+  sidekiq_options queue: :webhooks
+
+  USER_AGENT = 'DocuSeal.co Webhook'
+
+  MAX_ATTEMPTS = 10
+
+  def perform(params = {})
+    submission = Submission.find(params['submission_id'])
+
+    attempt = params['attempt'].to_i
+
+    webhook_url = submission.account.webhook_urls.find(params['webhook_url_id'])
+
+    url = webhook_url.url if webhook_url.events.include?('submission.completed')
+
+    return if url.blank?
+
+    resp = begin
+      Faraday.post(url,
+                   {
+                     event_type: 'submission.completed',
+                     timestamp: Time.current,
+                     data: Submissions::SerializeForApi.call(submission)
+                   }.to_json,
+                   **EncryptedConfig.find_or_initialize_by(account_id: submission.account_id,
+                                                           key: EncryptedConfig::WEBHOOK_SECRET_KEY)&.value.to_h,
+                   'Content-Type' => 'application/json',
+                   'User-Agent' => USER_AGENT)
+    rescue Faraday::Error
+      nil
+    end
+
+    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
+       (!Docuseal.multitenant? || submission.account.account_configs.exists?(key: :plan))
+      SendSubmissionCompletedWebhookRequestJob.perform_in((2**attempt).minutes, {
+                                                            **params,
+                                                            'attempt' => attempt + 1,
+                                                            'last_status' => resp&.status.to_i
+                                                          })
+    end
+  end
+end

app/mailers/submitter_mailer.rb

@@ -4,8 +4,6 @@ class SubmitterMailer < ApplicationMailer
   MAX_ATTACHMENTS_SIZE = 10.megabytes
   SIGN_TTL = 1.hour + 20.minutes
 
-  DEFAULT_INVITATION_SUBJECT = 'You are invited to submit a form'
-
   NO_REPLY_REGEXP = /no-?reply@/i
 
   def invitation_email(submitter)
@@ -21,17 +19,19 @@ class SubmitterMailer < ApplicationMailer
 
     @email_config = AccountConfigs.find_for_account(@current_account, AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY)
 
-    subject =
-      if @email_config || @subject
-        ReplaceEmailVariables.call(@subject || @email_config.value['subject'], submitter:)
-      else
-        DEFAULT_INVITATION_SUBJECT
-      end
-
     assign_message_metadata('submitter_invitation', @submitter)
 
     reply_to = build_submitter_reply_to(@submitter)
 
+    subject =
+      if @email_config || @subject
+        ReplaceEmailVariables.call(@subject || @email_config.value['subject'], submitter:)
+      elsif @submitter.with_signature_fields?
+        I18n.t(:you_are_invited_to_sign_a_document)
+      else
+        I18n.t(:you_are_invited_to_submit_a_form)
+      end
+
     mail(
       to: @submitter.friendly_name,
       from: from_address_for_submitter(submitter),
@@ -64,20 +64,35 @@ class SubmitterMailer < ApplicationMailer
     @body = @submitter.template.preferences['completed_notification_email_body'].presence
     @body ||= @email_config.value['body'] if @email_config
 
-    subject =
-      if @subject.present?
-        ReplaceEmailVariables.call(@subject, submitter:)
-      else
-        build_completed_subject(submitter)
-      end
-
     assign_message_metadata('submitter_completed', @submitter)
 
+    subject =
+      ReplaceEmailVariables.call(@subject.presence || I18n.t(:template_name_has_been_completed_by_submitters),
+                                 submitter:)
+
     mail(from: from_address_for_submitter(submitter),
          to: to || (user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name),
          subject:)
   end
 
+  def declined_email(submitter, user)
+    @current_account = submitter.submission.account
+    @submitter = submitter
+    @submission = submitter.submission
+    @user = user
+
+    assign_message_metadata('submitter_declined', @submitter)
+
+    I18n.with_locale(submitter.account.locale) do
+      mail(from: from_address_for_submitter(submitter),
+           to: user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name,
+           reply_to: @submitter.friendly_name,
+           subject: I18n.t(:name_declined_by_submitter,
+                           name: @submission.template.name.truncate(20),
+                           submitter: @submitter.name || @submitter.email || @submitter.phone))
+    end
+  end
+
   def documents_copy_email(submitter, to: nil, sig: false)
     @current_account = submitter.submission.account
     @submitter = submitter
@@ -98,17 +113,16 @@ class SubmitterMailer < ApplicationMailer
     @body = @submitter.template.preferences['documents_copy_email_body'].presence
     @body ||= @email_config.value['body'] if @email_config
 
+    assign_message_metadata('submitter_documents_copy', @submitter)
+    reply_to = build_submitter_reply_to(submitter)
+
     subject =
       if @subject.present?
         ReplaceEmailVariables.call(@subject, submitter:)
       else
-        'Your document copy'
+        I18n.t(:your_document_copy)
       end
 
-    assign_message_metadata('submitter_documents_copy', @submitter)
-
-    reply_to = build_submitter_reply_to(submitter)
-
     mail(from: from_address_for_submitter(submitter),
          to: to || @submitter.friendly_name,
          reply_to:,
@@ -127,19 +141,13 @@ class SubmitterMailer < ApplicationMailer
     reply_to
   end
 
-  def build_completed_subject(submitter)
-    submitters = submitter.submission.submitters.order(:completed_at)
-                          .map { |e| e.name || e.email || e.phone }.join(', ')
-    %(#{submitter.submission.template.name} has been completed by #{submitters})
-  end
-
   def add_completed_email_attachments!(submitter, with_audit_log: true, with_documents: true)
     documents = with_documents ? Submitters.select_attachments_for_download(submitter) : []
 
     total_size = 0
     audit_trail_data = nil
 
-    if with_audit_log && submitter.submission.audit_trail.present?
+    if with_audit_log && submitter.submission.audit_trail.present? && documents.first&.name != 'combined_document'
       audit_trail_data = submitter.submission.audit_trail.download
 
       total_size = audit_trail_data.size

app/models/account.rb

@@ -29,7 +29,7 @@ class Account < ApplicationRecord
   has_one :default_template_folder, -> { where(name: TemplateFolder::DEFAULT_NAME) },
           class_name: 'TemplateFolder', dependent: :destroy, inverse_of: :account
   has_many :submissions, dependent: :destroy
-  has_many :submitters, through: :submissions
+  has_many :submitters, dependent: :destroy
   has_many :account_linked_accounts, dependent: :destroy
   has_many :email_events, dependent: :destroy
   has_many :webhook_urls, dependent: :destroy

app/models/account_config.rb

@@ -40,31 +40,26 @@ class AccountConfig < ApplicationRecord
   FLATTEN_RESULT_PDF_KEY = 'flatten_result_pdf'
   WITH_SIGNATURE_ID = 'with_signature_id'
   REQUIRE_SIGNING_REASON_KEY = 'require_signing_reason'
+  COMBINE_PDF_RESULT_KEY = 'combine_pdf_result_key'
 
   DEFAULT_VALUES = {
-    SUBMITTER_INVITATION_EMAIL_KEY => {
+    SUBMITTER_INVITATION_EMAIL_KEY => lambda {
-      'subject' => 'You are invited to submit a form',
+      {
-      'body' => "Hi there,\n\n" \
+        'subject' => I18n.t(:you_are_invited_to_sign_a_document),
-                "You have been invited to submit the \"{{template.name}}\" form.\n\n" \
+        'body' => I18n.t(:submitter_invitation_email_sign_body)
-                "{{submitter.link}}\n\n" \
+      }
-                "Please contact us by replying to this email if you didn't request this.\n\n" \
-                "Thanks,\n" \
-                '{{account.name}}'
     },
-    SUBMITTER_COMPLETED_EMAIL_KEY => {
+    SUBMITTER_COMPLETED_EMAIL_KEY => lambda {
-      'subject' => '{{template.name}} has been completed by {{submission.submitters}}',
+      {
-      'body' => "Hi,\n\n" \
+        'subject' => I18n.t(:template_name_has_been_completed_by_submitters),
-                "\"{{template.name}}\" form has been completed by {{submission.submitters}}\n\n" \
+        'body' => I18n.t(:submitter_completed_email_body)
-                '{{submission.link}}'
+      }
     },
-    SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY => {
+    SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY => lambda {
-      'subject' => 'Your document copy',
+      {
-      'body' => "Hi there,\n\n" \
+        'subject' => I18n.t(:your_document_copy),
-                "Please check the copy of your \"{{template.name}}\" submission in the email attachments.\n" \
+        'body' => I18n.t(:submitter_documents_copy_email_body)
-                "Alternatively, you can download your copy using:\n\n" \
+      }
-                "{{documents.link}}\n\n" \
-                "Thanks,\n" \
-                '{{account.name}}'
     }
   }.freeze
 

app/models/submission.rb

@@ -22,7 +22,7 @@
 #
 # Indexes
 #
-#  index_submissions_on_account_id          (account_id)
+#  index_submissions_on_account_id_and_id   (account_id,id)
 #  index_submissions_on_created_by_user_id  (created_by_user_id)
 #  index_submissions_on_slug                (slug) UNIQUE
 #  index_submissions_on_template_id         (template_id)
@@ -86,4 +86,10 @@ class Submission < ApplicationRecord
     ActiveStorage::Blob.proxy_url(audit_trail.blob)
   end
   alias audit_log_url audit_trail_url
+
+  def combined_document_url
+    return if combined_document.blank?
+
+    ActiveStorage::Blob.proxy_url(combined_document.blob)
+  end
 end

app/models/submission_event.rb

@@ -47,7 +47,9 @@ class SubmissionEvent < ApplicationRecord
     phone_verified: 'phone_verified',
     start_form: 'start_form',
     view_form: 'view_form',
+    invite_party: 'invite_party',
     complete_form: 'complete_form',
+    decline_form: 'decline_form',
     api_complete_form: 'api_complete_form'
   }, scope: false
 

app/models/submitter.rb

@@ -6,6 +6,7 @@
 #
 #  id            :bigint           not null, primary key
 #  completed_at  :datetime
+#  declined_at   :datetime
 #  email         :string
 #  ip            :string
 #  metadata      :text             not null
@@ -20,15 +21,17 @@
 #  values        :text             not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
+#  account_id    :bigint           not null
 #  external_id   :string
 #  submission_id :bigint           not null
 #
 # Indexes
 #
-#  index_submitters_on_email          (email)
+#  index_submitters_on_account_id_and_id  (account_id,id)
-#  index_submitters_on_external_id    (external_id)
+#  index_submitters_on_email              (email)
-#  index_submitters_on_slug           (slug) UNIQUE
+#  index_submitters_on_external_id        (external_id)
-#  index_submitters_on_submission_id  (submission_id)
+#  index_submitters_on_slug               (slug) UNIQUE
+#  index_submitters_on_submission_id      (submission_id)
 #
 # Foreign Keys
 #
@@ -36,8 +39,8 @@
 #
 class Submitter < ApplicationRecord
   belongs_to :submission
+  belongs_to :account
   has_one :template, through: :submission
-  has_one :account, through: :submission
 
   attribute :values, :string, default: -> { {} }
   attribute :preferences, :string, default: -> { {} }
@@ -57,7 +60,9 @@ class Submitter < ApplicationRecord
   scope :completed, -> { where.not(completed_at: nil) }
 
   def status
-    if completed_at?
+    if declined_at?
+      'declined'
+    elsif completed_at?
       'completed'
     elsif opened_at?
       'opened'
@@ -80,7 +85,23 @@ class Submitter < ApplicationRecord
     end
   end
 
+  def first_name
+    name.split(/\s+/, 2).first
+  end
+
+  def last_name
+    name.split(/\s+/, 2).last
+  end
+
   def status_event_at
-    completed_at || opened_at || sent_at || created_at
+    declined_at || completed_at || opened_at || sent_at || created_at
+  end
+
+  def with_signature_fields?
+    @with_signature_fields ||= begin
+      fields = submission.template_fields || template.fields
+      signature_field_types = %w[signature initials]
+      fields.any? { |f| f['submitter_uuid'] == uuid && signature_field_types.include?(f['type']) }
+    end
   end
 end

app/views/accounts/show.html.erb

@@ -1,51 +1,55 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow max-w-xl mx-auto">
-    <h1 class="text-4xl font-bold mb-4">Account</h1>
+    <h1 class="text-4xl font-bold mb-4">
+      <%= t('account') %>
+    </h1>
     <%= form_for '', url: settings_account_path, method: :patch, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
       <%= fields_for current_account do |ff| %>
         <div class="form-control">
-          <%= ff.label :name, 'Company Name', class: 'label' %>
+          <%= ff.label :name, t('company_name'), class: 'label' %>
           <%= ff.text_field :name, required: true, class: 'base-input', dir: 'auto' %>
         </div>
         <div class="grid md:grid-cols-2 gap-4">
           <div class="form-control">
-            <%= ff.label :timezone, class: 'label' %>
+            <%= ff.label :timezone, t('time_zone'), class: 'label' %>
             <%= ff.select :timezone, nil, {}, class: 'base-select' do %>
               <%= time_zone_options_for_select(current_account.timezone) %>
             <% end %>
           </div>
           <div class="form-control">
-            <%= ff.label :locale, 'Time format', class: 'label' %>
+            <%= ff.label :locale, t('time_format'), class: 'label' %>
             <%= ff.select :locale, options_for_select(controller.class::LOCALE_OPTIONS.invert, current_account.locale), {}, class: 'base-select' %>
           </div>
         </div>
       <% end %>
       <% encrypted_config = @encrypted_config || EncryptedConfig.find_or_initialize_by(account: current_account, key: EncryptedConfig::APP_URL_KEY) %>
-      <% if !Docuseal.multitenant? && can?(:manage, encrypted_config) && !current_account.testing? %>
+      <% if !Docuseal.multitenant? && can?(:manage, encrypted_config) && !current_account.testing? && ENV['APP_URL'].blank? %>
         <%= fields_for encrypted_config do |ff| %>
           <div class="form-control">
-            <%= ff.label :value, 'App URL', class: 'label' %>
+            <%= ff.label :value, t('app_url'), class: 'label' %>
             <%= ff.text_field :value, autocomplete: 'off', class: 'base-input' %>
           </div>
         <% end %>
       <% end %>
       <% if can?(:update, current_account) %>
         <div class="form-control pt-2">
-          <%= f.button button_title(title: 'Update', disabled_with: 'Updating'), class: 'base-button' %>
+          <%= f.button button_title(title: t('update'), disabled_with: t('updating')), class: 'base-button' %>
         </div>
       <% end %>
     <% end %>
     <% if can?(:manage, AccountConfig) %>
       <div class="px-1 mt-8">
-        <h2 class="text-2xl font-bold mb-2">Preferences</h2>
+        <h2 class="text-2xl font-bold mb-2">
+          <%= t('preferences') %>
+        </h2>
         <% account_config = AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::FORCE_MFA) %>
         <% if can?(:manage, account_config) %>
           <%= form_for account_config, url: account_configs_path, method: :post do |f| %>
             <%= f.hidden_field :key %>
             <div class="flex items-center justify-between py-2.5">
               <span>
-                Force 2FA with Authenticator App
+                <%= t('force_2fa_with_authenticator_app') %>
               </span>
               <%= f.check_box :value, class: 'toggle', checked: account_config.value, onchange: 'this.form.requestSubmit()' %>
             </div>
@@ -57,7 +61,7 @@
             <%= f.hidden_field :key %>
             <div class="flex items-center justify-between py-2.5">
               <span>
-                Add signature ID to the documents
+                <%= t('add_signature_id_to_the_documents') %>
               </span>
               <%= f.check_box :value, class: 'toggle', checked: account_config.value, onchange: 'this.form.requestSubmit()' %>
             </div>
@@ -69,7 +73,7 @@
             <%= f.hidden_field :key %>
             <div class="flex items-center justify-between py-2.5">
               <span>
-                Require signing reason
+                <%= t('require_signing_reason') %>
               </span>
               <%= f.check_box :value, class: 'toggle', checked: account_config.value, onchange: 'this.form.requestSubmit()' %>
             </div>
@@ -81,7 +85,7 @@
             <%= f.hidden_field :key %>
             <div class="flex items-center justify-between py-2.5">
               <span>
-                Allow typed text signatures
+                <%= t('allow_typed_text_signatures') %>
               </span>
               <%= f.check_box :value, class: 'toggle', checked: account_config.value != false, onchange: 'this.form.requestSubmit()' %>
             </div>
@@ -93,7 +97,7 @@
             <%= f.hidden_field :key %>
             <div class="flex items-center justify-between py-2.5">
               <span>
-                Allow to resubmit completed forms
+                <%= t('allow_to_resubmit_completed_forms') %>
               </span>
               <%= f.check_box :value, class: 'toggle', checked: account_config.value != false, onchange: 'this.form.requestSubmit()' %>
             </div>
@@ -105,7 +109,7 @@
             <%= f.hidden_field :key %>
             <div class="flex items-center justify-between py-2.5">
               <span>
-                Remember and pre-fill signatures
+                <%= t('remember_and_pre_fill_signatures') %>
               </span>
               <%= f.check_box :value, class: 'toggle', checked: account_config.value != false, onchange: 'this.form.requestSubmit()' %>
             </div>
@@ -117,7 +121,19 @@
             <%= f.hidden_field :key %>
             <div class="flex items-center justify-between py-2.5">
               <span>
-                Require authentication for file download links
+                <%= t('require_authentication_for_file_download_links') %>
+              </span>
+              <%= f.check_box :value, class: 'toggle', checked: account_config.value, onchange: 'this.form.requestSubmit()' %>
+            </div>
+          <% end %>
+        <% end %>
+        <% account_config = AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::COMBINE_PDF_RESULT_KEY) %>
+        <% if can?(:manage, account_config) %>
+          <%= form_for account_config, url: account_configs_path, method: :post do |f| %>
+            <%= f.hidden_field :key %>
+            <div class="flex items-center justify-between py-2.5">
+              <span>
+                <%= t('combine_completed_documents_and_audit_log') %>
               </span>
               <%= f.check_box :value, class: 'toggle', checked: account_config.value, onchange: 'this.form.requestSubmit()' %>
             </div>
@@ -128,8 +144,10 @@
     <%= render 'integrations' %>
     <% if can?(:manage, current_account) && Docuseal.multitenant? && true_user == current_user %>
       <div class="px-1 mt-8">
-        <h2 class="text-2xl font-bold mb-2">Danger Zone</h2>
+        <h2 class="text-2xl font-bold mb-2">
-        <%= button_to button_title(title: 'Delete my account'), settings_account_path, class: 'btn btn-outline btn-error block', data: { turbo_confirm: 'Schedule account for deletion?' }, method: :delete, id: :account_delete_button %>
+          <%= t('danger_zone') %>
+        </h2>
+        <%= button_to button_title(title: t('delete_my_account')), settings_account_path, class: 'btn btn-outline btn-error block', data: { turbo_confirm: t('schedule_account_for_deletion_') }, method: :delete, id: :account_delete_button %>
       </div>
     <% end %>
   </div>

app/views/api_settings/index.html.erb

@@ -11,9 +11,9 @@
         <div class="flex flex-col md:flex-row gap-4">
           <div class="flex w-full space-x-4">
             <input id="api_key" type="text" value="<%= current_user.access_token.token %>" class="input font-mono input-bordered w-full" autocomplete="off" readonly>
-            <%= render 'shared/clipboard_copy', icon: 'copy', text: current_user.access_token.token, class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy', copied_title: 'Copied' %>
+            <%= render 'shared/clipboard_copy', icon: 'copy', text: current_user.access_token.token, class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: t('copy'), copied_title: t('copied') %>
           </div>
-          <%= button_to button_title(title: 'Rotate', disabled_with: 'Rotate', icon: svg_icon('reload', class: 'w-6 h-6')), settings_api_index_path, class: 'white-button w-full', data: { turbo_confirm: 'Remove existing API token and generated a new one. Are you sure?' } %>
+          <%= button_to button_title(title: t('rotate'), disabled_with: t('rotate'), icon: svg_icon('reload', class: 'w-6 h-6')), settings_api_index_path, class: 'white-button w-full', data: { turbo_confirm: t('remove_existing_api_token_and_generated_a_new_one_are_you_sure_') } %>
         </div>
       </div>
     </div>
@@ -22,7 +22,7 @@
         <input type="checkbox">
         <div class="collapse-title text-xl font-medium">
           <div>
-            Request signature, multiple submitters with default values
+            <%= t('request_signature_multiple_submitters_with_default_values') %>
           </div>
           <div class="mt-1">
             <div class="badge badge-warning badge-lg">POST</div>
@@ -48,7 +48,7 @@
          ]
        }'<% end.to_str %>
             <span class="top-0 right-0 absolute">
-              <%= render 'shared/clipboard_copy', icon: 'copy', text:, class: 'btn btn-ghost text-white', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy', copied_title: 'Copied' %>
+              <%= render 'shared/clipboard_copy', icon: 'copy', text:, class: 'btn btn-ghost text-white', icon_class: 'w-6 h-6 text-white', copy_title: t('copy'), copied_title: t('copied') %>
             </span>
             <pre data-prefix="$"><code class="overflow-hidden w-full"><%= text %></code></pre>
           </div>
@@ -58,7 +58,7 @@
         <input type="checkbox">
         <div class="collapse-title text-xl font-medium">
           <div>
-            Request signature, single submitter
+            <%= t('request_signature_single_submitter') %>
           </div>
           <div class="mt-1">
             <div class="badge badge-warning badge-lg">POST</div>
@@ -74,7 +74,7 @@
            "emails":  "<%= current_user.email.sub('@', '+test@') %>, <%= current_user.email.sub('@', '+test2@') %>"
        }'<% end.to_str %>
             <span class="top-0 right-0 absolute">
-              <%= render 'shared/clipboard_copy', icon: 'copy', text:, class: 'btn btn-ghost text-white', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy', copied_title: 'Copied' %>
+              <%= render 'shared/clipboard_copy', icon: 'copy', text:, class: 'btn btn-ghost text-white', icon_class: 'w-6 h-6 text-white', copy_title: t('copy'), copied_title: t('copied') %>
             </span>
             <pre data-prefix="$"><code class="overflow-hidden w-full"><%= text %></code></pre>
           </div>
@@ -84,7 +84,7 @@
         <input type="checkbox">
         <div class="collapse-title text-xl font-medium">
           <div>
-            Template details
+            <%= t('template_details') %>
           </div>
           <div class="mt-1">
             <div class="badge badge-info badge-lg">GET</div>
@@ -96,7 +96,7 @@
             <% text = capture do %>curl '<%= api_template_url(current_account.templates&.last || 1) %>' \
        --header 'X-Auth-Token: <%= current_user.access_token.token %>'<% end.to_str %>
             <span class="top-0 right-0 absolute">
-              <%= render 'shared/clipboard_copy', icon: 'copy', text:, class: 'btn btn-ghost text-white', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy', copied_title: 'Copied' %>
+              <%= render 'shared/clipboard_copy', icon: 'copy', text:, class: 'btn btn-ghost text-white', icon_class: 'w-6 h-6 text-white', copy_title: t('copy'), copied_title: t('copied') %>
             </span>
             <pre data-prefix="$"><code class="overflow-hidden w-full"><%= text %></code></pre>
           </div>
@@ -104,7 +104,7 @@
       </div>
     </div>
     <div class="text-center">
-      <%= link_to 'Open Full API Reference', "#{Docuseal::PRODUCT_URL}/docs/api", class: 'btn btn-warning text-base mt-4 px-8', target: '_blank', rel: 'noopener' %>
+      <%= link_to t('open_full_api_reference'), "#{Docuseal::PRODUCT_URL}/docs/api", class: 'btn btn-warning text-base mt-4 px-8', target: '_blank', rel: 'noopener' %>
     </div>
   </div>
 </div>

app/views/dashboard/_toggle_view.html.erb

@@ -1,10 +1,10 @@
-<form action="<%= root_path %>" method="get" class="bg-base-200 px-1.5 rounded-xl py-1">
+<form action="<%= root_path %>" method="get" class="bg-base-200 px-1.5 rounded-xl py-1 whitespace-nowrap">
-  <toggle-cookies data-value="templates" data-key="dashboard_view" class="sm:tooltip tooltip-top" data-tip="Templates">
+  <toggle-cookies data-value="templates" data-key="dashboard_view" class="sm:tooltip tooltip-top" data-tip="<%= t('templates') %>">
     <button class="<%= local_assigns[:selected] == 'submissions' ? 'btn !border !rounded-lg btn-square !p-0 !btn-sm !h-8 !w-9' : 'btn btn-neutral !rounded-lg btn-square !p-0 hover:text-neutral-300 !btn-sm !h-8 !w-9 disabled:btn-neutral' %>">
       <%= svg_icon('layout_grid', class: 'w-6 h-6 stroke-2') %>
     </button>
   </toggle-cookies>
-  <toggle-cookies data-value="submissions" data-key="dashboard_view" class="sm:tooltip tooltip-top" data-tip="Submissions">
+  <toggle-cookies data-value="submissions" data-key="dashboard_view" class="sm:tooltip tooltip-top" data-tip="<%= t('submissions') %>">
     <button class="<%= local_assigns[:selected] == 'submissions' ? 'btn btn-neutral !rounded-lg btn-square !p-0 hover:text-neutral-300 !btn-sm !h-8 !w-9' : 'btn !border !rounded-lg btn-square !p-0 !btn-sm !h-8 !w-9 disabled:btn-neutral' %>">
       <%= svg_icon('layout_list', class: 'w-6 h-6 stroke-2') %>
     </button>

app/views/devise/passwords/edit.html.erb

@@ -1,25 +1,27 @@
 <div class="max-w-lg mx-auto px-2">
-  <h1 class="text-4xl font-bold text-center mt-8">Change your password</h1>
+  <h1 class="text-4xl font-bold text-center mt-8">
+    <%= t('change_your_password') %>
+  </h1>
   <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: 'space-y-6' }) do |f| %>
     <div class="space-y-2">
       <%= render 'devise/shared/error_messages', resource: %>
       <%= f.hidden_field :reset_password_token %>
       <div class="form-control">
-        <%= f.label :password, 'New password', class: 'label' %>
+        <%= f.label :password, t('new_password'), class: 'label' %>
         <%= f.password_field :password, autofocus: true, autocomplete: 'new-password', class: 'base-input' %>
         <% if @minimum_password_length %>
           <label class="label">
-            <span class="label-text">(<%= @minimum_password_length %> characters minimum)</span>
+            <span class="label-text">(<%= t('minimum_password_length_characters_minimum', minimum_password_length: @minimum_password_length) %>)</span>
           </label>
         <% end %>
       </div>
       <div class="form-control">
-        <%= f.label :password_confirmation, 'Confirm new password', class: 'label' %>
+        <%= f.label :password_confirmation, t('confirm_new_password'), class: 'label' %>
         <%= f.password_field :password_confirmation, autocomplete: 'new-password', class: 'base-input' %>
       </div>
     </div>
     <div class="form-control">
-      <%= f.button button_title(title: 'Change my password', disabled_with: 'Changing password'), class: 'base-button' %>
+      <%= f.button button_title(title: t('change_my_password'), disabled_with: t('changing_password')), class: 'base-button' %>
     </div>
   <% end %>
 </div>

app/views/devise/passwords/new.html.erb

@@ -1,15 +1,17 @@
 <div class="max-w-lg mx-auto px-2">
-  <h1 class="text-4xl font-bold text-center mt-8">Forgot your password?</h1>
+  <h1 class="text-4xl font-bold text-center mt-8">
+    <%= t('forgot_your_password_') %>
+  </h1>
   <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, class: 'space-y-6' }) do |f| %>
     <div class="space-y-2">
       <%= render 'devise/shared/error_messages', resource: %>
       <div class="form-control">
-        <%= f.label :email, class: 'label' %>
+        <%= f.label :email, t(:email), class: 'label' %>
         <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'base-input' %>
       </div>
     </div>
     <div class="form-control">
-      <%= f.button button_title(title: 'Reset password', disabled_with: 'Resetting password'), class: 'base-button' %>
+      <%= f.button button_title(title: t('reset_password'), disabled_with: t('resetting_password')), class: 'base-button' %>
     </div>
   <% end %>
 </div>

app/views/devise/sessions/_extra_links.html.erb

@@ -0,0 +1 @@
+

app/views/devise/sessions/otp.html.erb

@@ -1,5 +1,7 @@
 <div class="max-w-lg mx-auto px-2">
-  <h1 class="text-4xl font-bold text-center mt-8">Sign In</h1>
+  <h1 class="text-4xl font-bold text-center mt-8">
+    <%= t('sign_in') %>
+  </h1>
   <%= form_for(resource, as: resource_name, html: { class: 'space-y-6' }, data: { turbo: params[:redir].blank? }, url: session_path(resource_name)) do |f| %>
     <%= f.hidden_field :email %>
     <%= f.hidden_field :password %>
@@ -8,12 +10,12 @@
     <% end %>
     <div class="space-y-2">
       <div class="form-control">
-        <%= f.label :otp_attempt, 'Two-Factor Code from Authenticator App', class: 'label' %>
+        <%= f.label :otp_attempt, t('two_factor_code_from_authenticator_app'), class: 'label' %>
         <%= f.text_field :otp_attempt, autofocus: true, placeholder: 'XXX-XXX', required: true, class: 'base-input' %>
       </div>
     </div>
     <div class="form-control">
-      <%= f.button button_title(title: 'Sign In', disabled_with: 'Signing In'), class: 'base-button' %>
+      <%= f.button button_title(title: t('sign_in'), disabled_with: t('signing_in')), class: 'base-button' %>
     </div>
   <% end %>
 </div>

app/views/devise/shared/_links.html.erb

@@ -3,7 +3,7 @@
     <%= link_to t('already_have_an_account'), new_session_path(resource_name, { lang: params[:lang] }.compact_blank), class: 'link link-hover mx-auto' %>
   <% end %>
   <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-    <%= link_to t('create_free_account'), registration_path({ redir: params[:redir], lang: params[:lang] }.compact_blank), class: 'link link-hover' %>
+    <%= link_to t('create_free_account'), registration_path({ redir: params[:redir], lang: params[:lang] }.compact_blank), class: 'link link-hover capitalize' %>
   <% end %>
   <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
     <%= link_to t('forgot_your_password_'), new_password_path(resource_name, { lang: params[:lang] }.compact_blank), class: 'link link-hover' %>

app/views/email_smtp_settings/index.html.erb

@@ -7,31 +7,31 @@
       <%= f.fields_for :value do |ff| %>
         <div class="grid md:grid-cols-2 gap-4">
           <div class="form-control">
-            <%= ff.label :host, class: 'label' %>
+            <%= ff.label :host, 'Host', class: 'label' %>
             <%= ff.text_field :host, value: value['host'], required: true, class: 'base-input' %>
           </div>
           <div class="form-control">
-            <%= ff.label :port, class: 'label' %>
+            <%= ff.label :port, 'Port', class: 'label' %>
             <%= ff.text_field :port, value: value['port'], required: true, class: 'base-input' %>
           </div>
         </div>
         <div class="grid md:grid-cols-2 gap-4">
           <div class="form-control">
-            <%= ff.label :username, class: 'label' %>
+            <%= ff.label :username, 'Username', class: 'label' %>
             <%= ff.text_field :username, value: value['username'], class: 'base-input' %>
           </div>
           <div class="form-control">
-            <%= ff.label :password, class: 'label' %>
+            <%= ff.label :password, 'Password', class: 'label' %>
             <%= ff.password_field :password, value: value['password'], class: 'base-input' %>
           </div>
         </div>
         <div class="grid md:grid-cols-2 gap-4">
           <div class="form-control">
-            <%= ff.label :domain, 'Domain (optional)', class: 'label' %>
+            <%= ff.label :domain, "Domain (#{t('optional')})", class: 'label' %>
             <%= ff.text_field :domain, value: value['domain'], class: 'base-input' %>
           </div>
           <div class="form-control">
-            <%= ff.label :authentication, class: 'label' %>
+            <%= ff.label :authentication, 'Authentication', class: 'label' %>
             <%= ff.select :authentication, options_for_select([%w[Plain plain], %w[Login login], %w[CRAM-MD5 cram_md5]], value.fetch('authentication', 'plain')), { prompt: true }, required: true, class: 'base-select' %>
           </div>
         </div>
@@ -47,12 +47,12 @@
           </div>
         </div>
         <div class="form-control">
-          <%= ff.label :from_email, 'Send from Email', class: 'label' %>
+          <%= ff.label :from_email, t('send_from_email'), class: 'label' %>
           <%= ff.email_field :from_email, value: value['from_email'], required: true, class: 'base-input' %>
         </div>
       <% end %>
       <div class="form-control pt-2">
-        <%= f.button button_title(title: 'Save', disabled_with: 'Saving'), class: 'base-button' %>
+        <%= f.button button_title(title: t('save'), disabled_with: t('saving')), class: 'base-button' %>
       </div>
     <% end %>
   </div>

app/views/errors/404.html

@@ -13,20 +13,13 @@
     }
 
     .error-page h1 {
-      font-weight: 700;
-      font-size: 3em;
-      color: #291434;
-      margin: 0 0 0.1em;
-    }
-
-    .error-page h2 {
       font-weight: 700;
       font-size: 10em;
       color: #3BBFF7;
       margin: 0 0 0.1em;
     }
 
-    .error-page h3 {
+    .error-page h2 {
       font-weight: 600;
       font-size: 1.75em;
       color: #291434;
@@ -56,9 +49,8 @@
   <body class="error-page">
     <div class="dialog">
       <div>
-        <h1>DocuSeal</h1>
+        <h1>404</h1>
-        <h2>404</h2>
+        <h2>Sorry, we couldn't find this page.</h2>
-        <h3>Sorry, we couldn't find this page.</h3>
       </div>
       <a rel="noopener noreferrer" href="/" class="btn">Back to homepage</a>
     </div>

app/views/errors/422.html

@@ -13,20 +13,13 @@
     }
 
     .error-page h1 {
-      font-weight: 700;
-      font-size: 3em;
-      color: #291434;
-      margin: 0 0 0.1em;
-    }
-
-    .error-page h2 {
       font-weight: 700;
       font-size: 10em;
       color: #FABE22;
       margin: 0 0 0.1em;
     }
 
-    .error-page h3 {
+    .error-page h2 {
       font-weight: 600;
       font-size: 1.75em;
       color: #291434;
@@ -56,9 +49,8 @@
   <body class="error-page">
     <div class="dialog">
       <div>
-        <h1>DocuSeal</h1>
+        <h1>422</h1>
-        <h2>422</h2>
+        <h2>You're not allowed to access this page</h2>
-        <h3>You're not allowed to access this page</h3>
       </div>
       <a rel="noopener noreferrer" href="/" class="btn">Back to homepage</a>
     </div>

app/views/errors/500.html

@@ -13,20 +13,13 @@
     }
 
     .error-page h1 {
-      font-weight: 700;
-      font-size: 3em;
-      color: #291434;
-      margin: 0 0 0.1em;
-    }
-
-    .error-page h2 {
       font-weight: 700;
       font-size: 10em;
       color: #F97272;
       margin: 0 0 0.1em;
     }
 
-    .error-page h3 {
+    .error-page h2 {
       font-weight: 600;
       font-size: 1.75em;
       color: #291434;
@@ -56,9 +49,8 @@
   <body class="error-page">
     <div class="dialog">
       <div>
-        <h1>DocuSeal</h1>
+        <h1>500</h1>
-        <h2>500</h2>
+        <h2>We're sorry, but something went wrong</h2>
-        <h3>We're sorry, but something went wrong</h3>
       </div>
       <a rel="noopener noreferrer" href="/" class="btn">Back to homepage</a>
     </div>

app/views/esign_settings/new.html.erb

@@ -1,19 +1,21 @@
-<%= render 'shared/turbo_modal', title: 'Upload Certificate' do %>
+<%= render 'shared/turbo_modal', title: t('upload_certificate') do %>
   <%= form_for @cert_record, url: settings_esign_path, html: { class: 'space-y-4', enctype: 'multipart/form-data' }, data: { turbo_frame: :_top } do |f| %>
     <div class="space-y-2">
       <div class="form-control">
-        <%= f.label :name, class: 'label' %>
+        <%= f.label :name, t('name'), class: 'label' %>
         <%= f.text_field :name, required: true, class: 'base-input' %>
       </div>
       <div class="form-control">
-        <%= f.label :file, class: 'label' %>
+        <%= f.label :file, t('file'), class: 'label' %>
         <%= f.file_field :file, required: true %>
         <label class="label">
-          <span class="label-text-alt">Use a valid .der, .p12 or .pfx file.</span>
+          <span class="label-text-alt">
+            <%= t('use_a_valid_der_p12_or_pfx_file') %>
+          </span>
         </label>
       </div>
       <div class="form-control">
-        <%= f.label :password, 'Password (optional)', class: 'label' %>
+        <%= f.label :password, "#{t('password')} (#{t('optional')})", class: 'label' %>
         <%= f.password_field :password, class: 'base-input' %>
       </div>
     </div>