Merge from docusealco/wip

fix ci
fix build
2026-11-04 14:42:32 -05:00 · 2025-02-05 13:44:10 +02:00 · 2025-02-04 19:37:42 +02:00 · 2025-02-04 18:47:15 +02:00 · 2025-02-04 16:55:24 +02:00 · 2025-02-04 16:19:49 +02:00
62 changed files with 564 additions and 290 deletions
@@ -7,13 +7,13 @@ jobs:
    name: Rubocop
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Install Ruby
        uses: ruby/setup-ruby@v1
        with:
          ruby-version: 3.4.1
      - name: Cache gems
-        uses: actions/cache@v1
+        uses: actions/cache@v4
        with:
          path: vendor/bundle
          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -31,13 +31,13 @@ jobs:
    name: Erblint
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Install Ruby
        uses: ruby/setup-ruby@v1
        with:
          ruby-version: 3.4.1
      - name: Cache gems
-        uses: actions/cache@v1
+        uses: actions/cache@v4
        with:
          path: vendor/bundle
          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -55,7 +55,7 @@ jobs:
    name: ESLint
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Install Node.js
        uses: actions/setup-node@v1
        with:
@@ -63,7 +63,7 @@ jobs:
      - name: Cache directory path
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
        id: yarn-cache
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -96,7 +96,7 @@ jobs:
          --health-retries 5

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Install Ruby
        uses: ruby/setup-ruby@v1
        with:
@@ -110,12 +110,12 @@ jobs:
        with:
          chrome-version: 125
      - name: Cache node_modules
-        uses: actions/cache@v1
+        uses: actions/cache@v4
        with:
          path: node_modules
          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
      - name: Cache gems
-        uses: actions/cache@v1
+        uses: actions/cache@v4
        with:
          path: vendor/bundle
          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -7,7 +7,7 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm

    steps:
    - name: Checkout code
@@ -25,22 +25,22 @@ jobs:
        tags: |
          type=semver,pattern={{version}}
    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3

    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3

    - name: Create .version file
      run: echo ${{ github.ref_name }} > .version

    - name: Login to Docker Hub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
      with:
        username: ${{ secrets.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}

    - name: Build and push Docker image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v6
      with:
        context: .
        push: true
@@ -223,9 +223,12 @@ GEM
      concurrent-ruby (~> 1.1)
      webrick (~> 1.7)
      websocket-driver (~> 0.7)
-    ffi (1.17.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.1)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
    geom2d (0.4.1)
    globalid (1.2.1)
      activesupport (>= 6.1)
@@ -334,12 +337,18 @@ GEM
    net-smtp (0.5.0)
      net-protocol
    nio4r (2.7.4)
-    nokogiri (1.17.2)
+    nokogiri (1.18.2)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.17.2-aarch64-linux)
+    nokogiri (1.18.2-aarch64-linux-gnu)
      racc (~> 1.4)
-    nokogiri (1.17.2-x86_64-linux)
+    nokogiri (1.18.2-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.2-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.2-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.2-x86_64-linux-musl)
      racc (~> 1.4)
    oj (3.16.8)
      bigdecimal (>= 3.0)
@@ -520,10 +529,13 @@ GEM
    simplecov-html (0.13.1)
    simplecov_json_formatter (0.1.4)
    smart_properties (1.17.0)
-    sqlite3 (2.4.1)
+    sqlite3 (2.5.0)
      mini_portile2 (~> 2.8.0)
-    sqlite3 (2.4.1-aarch64-linux-gnu)
-    sqlite3 (2.4.1-x86_64-linux-gnu)
+    sqlite3 (2.5.0-aarch64-linux-gnu)
+    sqlite3 (2.5.0-aarch64-linux-musl)
+    sqlite3 (2.5.0-arm64-darwin)
+    sqlite3 (2.5.0-x86_64-linux-gnu)
+    sqlite3 (2.5.0-x86_64-linux-musl)
    stringio (3.1.2)
    strip_attributes (1.14.1)
      activemodel (>= 3.0, < 9.0)
@@ -569,8 +581,11 @@ GEM

 PLATFORMS
  aarch64-linux
+  aarch64-linux-musl
+  arm64-darwin
  ruby
  x86_64-linux
+  x86_64-linux-musl

 DEPENDENCIES
  annotate
@@ -50,7 +50,7 @@ class AccountsController < ApplicationController
    # rubocop:disable Layout/LineLength
    render turbo_stream: turbo_stream.replace(
      :account_delete_button,
-      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'))
+      html: helpers.tag.p(I18n.t('your_account_removal_request_will_be_processed_within_2_months_please_contact_us_if_you_want_to_keep_your_account'))
    )
    # rubocop:enable Layout/LineLength
  end
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class PwaController < ActionController::Base
+end
@@ -64,6 +64,7 @@ class StartFormController < ApplicationController
                                        .or(template.submissions.where(expire_at: nil)).where(archived_at: nil))
             .order(id: :desc)
             .where(declined_at: nil)
+             .where(external_id: nil)
             .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
             .find_or_initialize_by(**submitter_params.compact_blank)
  end
@@ -20,7 +20,10 @@ class SubmissionsPreviewController < ApplicationController

    @submission ||= Submission.find_by!(slug: params[:slug])

-    if @submission.account.archived_at? || (!@submission.submitters.all?(&:completed_at?) && current_user.blank?)
+    raise ActionController::RoutingError if @submission.account.archived_at?
+
+    if !@submission.submitters.all?(&:completed_at?) && !signature_valid &&
+       (!current_user || !current_ability.can?(:read, @submission))
      raise ActionController::RoutingError, I18n.t('not_found')
    end

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class SubmittersResubmitController < ApplicationController
+  load_and_authorize_resource :submitter, parent: false
+
+  def update
+    return redirect_to submit_form_path(slug: @submitter.slug) if @submitter.email != current_user.email
+
+    submission = @submitter.template.submissions.new(created_by_user: current_user,
+                                                     submitters_order: :preserved,
+                                                     **@submitter.submission.slice(:template_fields,
+                                                                                   :account_id,
+                                                                                   :template_schema,
+                                                                                   :template_submitters,
+                                                                                   :preferences))
+
+    @submitter.submission.submitters.each do |submitter|
+      new_submitter = submission.submitters.new(submitter.slice(:uuid, :email, :phone, :name,
+                                                                :preferences, :metadata, :account_id))
+
+      next unless submitter.uuid == @submitter.uuid
+
+      assign_submitter_values(new_submitter, submitter)
+
+      @new_submitter ||= new_submitter
+    end
+
+    submission.save!
+
+    redirect_to submit_form_path(slug: @new_submitter.slug)
+  end
+
+  private
+
+  def assign_submitter_values(new_submitter, submitter)
+    attachments_index = submitter.attachments.index_by(&:uuid)
+
+    submitter.submission.template_fields.each do |field|
+      next if field['submitter_uuid'] != submitter.uuid
+      next if field['default_value'] == '{{date}}'
+      next if field['type'] == 'stamp'
+      next if field['type'] == 'signature'
+      next if field.dig('preferences', 'formula').present?
+
+      value = submitter.values[field['uuid']]
+
+      next if value.blank?
+
+      if field['type'].in?(%w[image file initials])
+        Array.wrap(value).each do |attachment_uuid|
+          new_submitter.attachments << attachments_index[attachment_uuid].dup
+        end
+      end
+
+      new_submitter.values[field['uuid']] = value
+    end
+  end
+end
@@ -191,10 +191,16 @@
        class="whitespace-pre-wrap text-gray-400"
        :class="{ 'w-full': field.preferences?.align }"
      >{{ field.name }}</span>
-      <span v-else-if="Array.isArray(modelValue)">
+      <span
+        v-else-if="Array.isArray(modelValue)"
+        :class="{ 'w-full': field.preferences?.align }"
+      >
        {{ modelValue.join(', ') }}
      </span>
-      <span v-else-if="field.type === 'date'">
+      <span
+        v-else-if="field.type === 'date'"
+        :class="{ 'w-full': field.preferences?.align }"
+      >
        {{ formattedDate }}
      </span>
      <span
@@ -31,7 +31,7 @@
            :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)"
+            @click="[$emit('focus-step', stepIndex), maybeScrollOnClick(field, area)]"
          />
        </Teleport>
      </template>
@@ -109,6 +109,14 @@ export default {
      areaRefs: []
    }
  },
+  computed: {
+    isMobileContainer () {
+      const root = this.$root.$el.parentNode.getRootNode()
+      const container = root.body || root.querySelector('div')
+
+      return container.style.overflow === 'hidden'
+    }
+  },
  beforeUpdate () {
    this.areaRefs = []
  },
@@ -121,14 +129,16 @@ export default {
        this.scrollIntoArea(field.areas[0])
      }
    },
+    maybeScrollOnClick (field, area) {
+      if (['text', 'number', 'cells'].includes(field.type) && this.isMobileContainer) {
+        this.scrollIntoArea(area)
+      }
+    },
    scrollIntoArea (area) {
      const areaRef = this.areaRefs.find((a) => a.area === area)

      if (areaRef) {
-        const root = this.$root.$el.parentNode.getRootNode()
-        const container = root.body || root.querySelector('div')
-
-        if (container.style.overflow === 'hidden') {
+        if (this.isMobileContainer) {
          this.scrollInContainer(areaRef.$el)
        } else {
          const targetRect = areaRef.$refs.scrollToElem.getBoundingClientRect()
@@ -49,7 +49,7 @@
      <MarkdownContent :string="field.description" />
    </div>
    <FileDropzone
-      :message="`${t('upload')} ${field.name || t('files')}${field.required ? '' : ` (${t('optional')})`}`"
+      :message="`${t('upload')} ${(field.title || field.name) || t('files')}${field.required ? '' : ` (${t('optional')})`}`"
      :submitter-slug="submitterSlug"
      :multiple="true"
      :dry-run="dryRun"
@@ -1,22 +1,28 @@
 <template>
  <div dir="auto">
    <div
-      class="flex justify-between items-center w-full"
+      class="flex justify-between items-end w-full mb-3.5 sm:mb-4"
      :class="{ 'mb-2': !field.description }"
    >
      <label
+        v-if="showFieldNames"
        :for="field.uuid"
-        class="label text-2xl"
+        class="label text-xl sm:text-2xl py-0"
      >
        <MarkdownContent
          v-if="field.title"
          :string="field.title"
        />
        <template v-else>
-          {{ field.name && showFieldNames ? field.name : t('date') }}
-          <template v-if="!field.required">
+          {{ field.name || t('date') }}
+        </template>
+        <template v-if="!field.required">
+          <span
+            class="ml-1"
+            :class="{ 'hidden sm:inline': (field.title || field.name || t('date') ).length > 10 }"
+          >
            ({{ t('optional') }})
-          </template>
+          </span>
        </template>
      </label>
      <button
@@ -128,7 +128,7 @@ export default {
              }
            })
          } else {
-            if (file.type === 'image/bmp') {
+            if (file.type === 'image/bmp' || file.type === 'image/vnd.microsoft.icon') {
              file = await this.convertBmpToPng(file)
            }

@@ -164,7 +164,7 @@
              v-if="showFieldNames && (currentField.name || currentField.title)"
              :for="currentField.uuid"
              dir="auto"
-              class="label text-2xl"
+              class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5"
              :class="{ 'mb-2': !currentField.description }"
            >
              <MarkdownContent
@@ -173,7 +173,11 @@
              />
              <template v-else>
                {{ currentField.name }}
-                <template v-if="!currentField.required">({{ t('optional') }})</template>
+              </template>
+              <template v-if="!currentField.required">
+                <span :class="{ 'hidden sm:inline': (currentField.title || currentField.name).length > 20 }">
+                  ({{ t('optional') }})
+                </span>
              </template>
            </label>
            <div
@@ -221,7 +225,7 @@
              v-if="showFieldNames && (currentField.name || currentField.title)"
              :for="currentField.uuid"
              dir="auto"
-              class="label text-2xl"
+              class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5"
              :class="{ 'mb-2': !currentField.description }"
            >
              <MarkdownContent
@@ -230,7 +234,11 @@
              />
              <template v-else>
                {{ currentField.name }}
-                <template v-if="!currentField.required">({{ t('optional') }})</template>
+              </template>
+              <template v-if="!currentField.required">
+                <span :class="{ 'hidden sm:inline': (currentField.title || currentField.name).length > 20 }">
+                  ({{ t('optional') }})
+                </span>
              </template>
            </label>
            <div
@@ -466,7 +474,7 @@
        </div>
        <div
          v-if="(currentField.type !== 'payment' && currentField.type !== 'verification') || submittedValues[currentField.uuid]"
-          :class="currentField.type === 'signature' ? 'mt-2' : 'mt-6 md:mt-8'"
+          :class="currentField.type === 'signature' ? 'mt-2' : 'mt-4 md:mt-6'"
        >
          <button
            id="submit_form_button"
@@ -522,9 +530,9 @@
      />
      <div
        v-if="stepFields.length < 80"
-        class="flex justify-center"
+        class="flex justify-center mt-3 sm:mt-4 mb-0 sm:mb-1"
      >
-        <div class="flex items-center mt-4 mb-1 flex-wrap">
+        <div class="flex items-center flex-wrap">
          <a
            v-for="(step, index) in stepFields"
            :key="step[0].uuid"
@@ -1,9 +1,19 @@
 <template>
  <div v-if="modelValue">
-    <div class="flex justify-between items-center w-full mb-2">
+    <div class="flex justify-between items-end w-full mb-3.5 md:mb-4">
      <label
-        class="label text-2xl"
-      >{{ showFieldNames && field.name ? field.name : t('image') }}</label>
+        v-if="showFieldNames"
+        :for="field.uuid"
+        class="label text-xl sm:text-2xl py-0"
+      >
+        <MarkdownContent
+          v-if="field.title"
+          :string="field.title"
+        />
+        <template v-else>
+          {{ field.name || t('image') }}
+        </template>
+      </label>
      <button
        class="btn btn-outline btn-sm"
        @click.prevent="remove"
@@ -35,7 +45,7 @@
      <MarkdownContent :string="field.description" />
    </div>
    <FileDropzone
-      :message="`${t('upload')} ${field.name || t('image')}${field.required ? '' : ` (${t('optional')})`}`"
+      :message="`${t('upload')} ${(field.title || field.name) || t('image')}${field.required ? '' : ` (${t('optional')})`}`"
      :submitter-slug="submitterSlug"
      :dry-run="dryRun"
      :accept="'image/*'"
@@ -1,21 +1,22 @@
 <template>
  <div dir="auto">
    <div
-      class="flex justify-between items-center w-full"
+      class="flex justify-between items-end w-full mb-3.5 md:mb-4"
      :class="{ 'mb-2': !field.description }"
    >
      <label
-        class="label text-2xl"
+        v-if="showFieldNames"
+        class="label text-xl sm:text-2xl py-0"
      >
        <MarkdownContent
          v-if="field.title"
          :string="field.title"
        />
        <template v-else>
-          {{ showFieldNames && field.name ? field.name : t('initials') }}
+          {{ field.name || t('initials') }}
        </template>
      </label>
-      <div class="space-x-2 flex">
+      <div class="space-x-2 flex flex-none">
        <span
          v-if="isDrawInitials"
          class="tooltip"
@@ -40,7 +40,7 @@
      >
    </div>
    <div
-      class="mt-6 md:mt-8"
+      class="mt-4 md:mt-6"
    >
      <button
        type="submit"
@@ -3,13 +3,19 @@
    v-if="showFieldNames && (field.name || field.title)"
    :for="field.uuid"
    dir="auto"
-    class="label text-2xl"
+    class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5"
    :class="{ 'mb-2': !field.description }"
-  ><MarkdownContent
-     v-if="field.title"
-     :string="field.title"
-   />
+  >
+    <MarkdownContent
+      v-if="field.title"
+      :string="field.title"
+    />
    <template v-else>{{ field.name }}</template>
+    <template v-if="!field.required">
+      <span :class="{ 'hidden sm:inline': (field.title || field.name).length > 20 }">
+        ({{ t('optional') }})
+      </span>
+    </template>
  </label>
  <div
    v-if="field.description"
@@ -3,15 +3,18 @@
    v-if="showFieldNames && (field.name || field.title)"
    :for="field.uuid"
    dir="auto"
-    class="label text-2xl"
+    class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5"
    :class="{ 'mb-2': !field.description }"
-  ><MarkdownContent
-     v-if="field.title"
-     :string="field.title"
-   />
+  >
+    <MarkdownContent
+      v-if="field.title"
+      :string="field.title"
+    />
    <template v-else>{{ field.name }}</template>
    <template v-if="!field.required">
-      ({{ t('optional') }})
+      <span :class="{ 'hidden sm:inline': (field.title || field.name).length > 20 }">
+        ({{ t('optional') }})
+      </span>
    </template>
  </label>
  <div
@@ -1,7 +1,7 @@
 <template>
  <label
    v-if="!modelValue && !sessionId"
-    class="label text-2xl mb-2"
+    class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5"
  >
    <MarkdownContent
      v-if="field.title"
@@ -1,8 +1,9 @@
 <template>
  <div>
    <label
+      v-if="showFieldNames"
      :for="isCodeSent ? 'one_time_code' : field.uuid"
-      class="label text-2xl"
+      class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5"
      :class="{ 'mb-2': !field.description }"
    >
      <MarkdownContent
@@ -10,10 +11,7 @@
        :string="field.title"
      />
      <template v-else>
-        {{ showFieldNames && field.name ? field.name : t('verified_phone_number') }}
-        <template v-if="!field.required">
-          ({{ t('optional') }})
-        </template>
+        {{ field.name || t('verified_phone_number') }}
      </template>
    </label>
    <div
@@ -4,21 +4,22 @@
    class="relative"
  >
    <div
-      class="flex justify-between items-center w-full"
+      class="flex justify-between items-end w-full mb-3.5 md:mb-4"
      :class="{ 'mb-2': !field.description }"
    >
      <label
-        class="label text-2xl"
+        v-if="showFieldNames"
+        class="label text-xl sm:text-2xl py-0"
      >
        <MarkdownContent
          v-if="field.title"
          :string="field.title"
        />
        <template v-else>
-          {{ showFieldNames && field.name ? field.name : t('signature') }}
+          {{ field.name || t('signature') }}
        </template>
      </label>
-      <div class="space-x-2 flex">
+      <div class="space-x-2 flex flex-none">
        <span
          v-if="isTextSignature && format !== 'typed' && format !== 'upload'"
          class="tooltip"
@@ -39,6 +40,7 @@
        <span
          v-else-if="withTypedSignature && format !== 'typed' && format !== 'drawn' && format !== 'upload'"
          class="tooltip ml-2"
+          :class="{ 'hidden sm:inline': modelValue || computedPreviousValue }"
          :data-tip="t('type_text')"
        >
          <a
@@ -56,6 +58,7 @@
        <span
          v-if="format !== 'typed' && format !== 'drawn' && format !== 'upload' && format !== 'drawn_or_typed'"
          class="tooltip"
+          :class="{ 'hidden sm:inline': modelValue || computedPreviousValue }"
          :data-tip="t('take_photo')"
        >
          <label
@@ -3,15 +3,18 @@
    v-if="showFieldNames && (field.name || field.title)"
    :for="field.uuid"
    dir="auto"
-    class="label text-2xl"
+    class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5"
    :class="{ 'mb-2': !field.description }"
-  ><MarkdownContent
-     v-if="field.title"
-     :string="field.title"
-   />
+  >
+    <MarkdownContent
+      v-if="field.title"
+      :string="field.title"
+    />
    <template v-else>{{ field.name }}</template>
    <template v-if="!field.required">
-      ({{ t('optional') }})
+      <span :class="{ 'hidden sm:inline': (field.title || field.name).length > 20 }">
+        ({{ t('optional') }})
+      </span>
    </template>
  </label>
  <div
@@ -1,6 +1,6 @@
 <template>
  <label
-    class="label text-2xl mb-2"
+    class="label text-xl sm:text-2xl py-0 mb-2 sm:mb-3.5"
  >
    <MarkdownContent
      v-if="field.title"
@@ -31,6 +31,15 @@
        class="animate-spin h-10"
      />
    </div>
+    <div v-else-if="redirectUrl">
+      <a
+        :href="redirectUrl"
+        target="_blank"
+        class="white-button w-full"
+      >
+        {{ t('verify_id') }}
+      </a>
+    </div>
    <div
      ref="widgetContainer"
    />
@@ -87,6 +96,7 @@ export default {
    return {
      isCreatingCheckout: false,
      isMathLoaded: false,
+      redirectUrl: '',
      isLoading: false,
      eidEasyData: {}
    }
@@ -147,14 +157,26 @@ export default {
      }).then(async (resp) => {
        this.eidEasyData = await resp.json()

-        const eidEasyWidget = document.createElement('eideasy-widget')
+        if (this.eidEasyData.available_methods[0] === 'itsme-qes-signature' &&
+            this.eidEasyData.available_methods.length === 1) {
+          const redirectUrl = new URL('https://id.eideasy.com/sign_contract_external')

-        for (const key in this.widgetSettings) {
-          eidEasyWidget[key] = this.widgetSettings[key]
+          redirectUrl.searchParams.append('client_id', this.eidEasyData.client_id)
+          redirectUrl.searchParams.append('doc_id', this.eidEasyData.doc_id)
+          redirectUrl.searchParams.append('country', this.countryCode)
+          redirectUrl.searchParams.append('lang', this.locale)
+
+          this.redirectUrl = redirectUrl.toString()
+        } else {
+          const eidEasyWidget = document.createElement('eideasy-widget')
+
+          for (const key in this.widgetSettings) {
+            eidEasyWidget[key] = this.widgetSettings[key]
+          }
+
+          this.$refs.widgetContainer.innerHTML = ''
+          this.$refs.widgetContainer.appendChild(eidEasyWidget)
        }
-
-        this.$refs.widgetContainer.innerHTML = ''
-        this.$refs.widgetContainer.appendChild(eidEasyWidget)
      })
    },
    async submit () {
@@ -361,6 +361,7 @@ export default {
      isMoved: false,
      renderDropdown: false,
      isNameFocus: false,
+      isHeadingSelected: false,
      textOverflowChars: 0,
      dragFrom: { x: 0, y: 0 }
    }
@@ -377,7 +378,7 @@ export default {
      }
    },
    isValueInput () {
-      return (this.field.type === 'heading' && this.isSelected) || this.isContenteditable || (this.inputMode && ['text', 'number', 'date'].includes(this.field.type))
+      return (this.field.type === 'heading' && this.isHeadingSelected) || this.isContenteditable || (this.inputMode && ['text', 'number', 'date'].includes(this.field.type))
    },
    modalContainerEl () {
      return this.$el.getRootNode().querySelector('#docuseal_modal_container')
@@ -485,7 +486,7 @@ export default {
      if (['text', 'number'].includes(this.field.type)) {
        this.isContenteditable = true

-        this.$nextTick(() => this.focusValueInput())
+        this.focusValueInput()
      } else if (this.field.type === 'checkbox') {
        this.field.readonly = !this.field.readonly
        this.field.default_value === true ? delete this.field.default_value : this.field.default_value = true
@@ -507,16 +508,18 @@ export default {
      }
    },
    focusValueInput (e) {
-      if (this.$refs.defaultValue !== document.activeElement) {
-        this.$refs.defaultValue.focus()
+      this.$nextTick(() => {
+        if (this.$refs.defaultValue && this.$refs.defaultValue !== document.activeElement) {
+          this.$refs.defaultValue.focus()

-        if (this.$refs.defaultValue.innerText.length && this.$refs.defaultValue !== e?.target) {
-          window.getSelection().collapse(
-            this.$refs.defaultValue.firstChild,
-            this.$refs.defaultValue.innerText.length
-          )
+          if (this.$refs.defaultValue.innerText.length && this.$refs.defaultValue !== e?.target) {
+            window.getSelection().collapse(
+              this.$refs.defaultValue.firstChild,
+              this.$refs.defaultValue.innerText.length
+            )
+          }
        }
-      }
+      })
    },
    formatNumber (number, format) {
      if (format === 'comma') {
@@ -632,6 +635,7 @@ export default {
      const text = this.$refs.defaultValue.innerText.trim()

      this.isContenteditable = false
+      this.isHeadingSelected = false

      if (text) {
        if (this.field.type === 'number') {
@@ -749,10 +753,6 @@ export default {

      this.selectedAreaRef.value = this.area

-      if (this.field.type === 'heading') {
-        this.$nextTick(() => this.focusValueInput())
-      }
-
      this.dragFrom = { x: rect.left - e.clientX, y: rect.top - e.clientY }

      this.$el.getRootNode().addEventListener('mousemove', this.mouseMove)
@@ -787,6 +787,12 @@ export default {
        this.save()
      }

+      if (this.field.type === 'heading') {
+        this.isHeadingSelected = !this.isMoved
+
+        this.focusValueInput()
+      }
+
      this.isDragged = false
      this.isMoved = false

@@ -366,6 +366,7 @@
            :with-help="withHelp"
            :default-submitters="defaultSubmitters"
            :draw-field-type="drawFieldType"
+            :with-fields-search="withFieldsSearch"
            :default-fields="[...defaultRequiredFields, ...defaultFields]"
            :template="template"
            :default-required-fields="defaultRequiredFields"
@@ -623,6 +624,11 @@ export default {
      required: false,
      default: true
    },
+    withFieldsSearch: {
+      type: Boolean,
+      required: false,
+      default: null
+    },
    withFieldsList: {
      type: Boolean,
      required: false,
@@ -1427,6 +1433,8 @@ export default {
          const documentRef = this.documentRefs.find((e) => e.document.uuid === area.attachment_uuid)
          const areaRef = documentRef.pageRefs[area.page].areaRefs.find((ref) => ref.area === this.selectedAreaRef.value)

+          areaRef.isHeadingSelected = true
+
          areaRef.focusValueInput()
        })
      }
@@ -177,7 +177,7 @@ export default {
    fields () {
      if (this.item.submitter_uuid) {
        return this.template.fields.reduce((acc, f) => {
-          if (f !== this.item && f.submitter_uuid === this.item.submitter_uuid) {
+          if (f !== this.item) {
            acc.push(f)
          }

@@ -143,6 +143,7 @@
      <li
        v-for="(submitter, index) in submitters"
        :key="submitter.uuid"
+        class="w-full"
      >
        <a
          href="#"
@@ -191,7 +192,10 @@
          </div>
        </a>
      </li>
-      <li v-if="submitters.length < names.length && editable && allowAddNew">
+      <li
+        v-if="submitters.length < names.length && editable && allowAddNew"
+        class="w-full"
+      >
        <a
          href="#"
          class="flex px-2"
@@ -215,6 +219,14 @@ import { IconUserPlus, IconTrashX, IconPlus, IconChevronUp, IconChevronDown } fr
 import Contenteditable from './contenteditable'
 import { v4 } from 'uuid'

+function getOrdinalSuffix (num) {
+  if (num % 10 === 1 && num % 100 !== 11) return 'st'
+  if (num % 10 === 2 && num % 100 !== 12) return 'nd'
+  if (num % 10 === 3 && num % 100 !== 13) return 'rd'
+
+  return 'th'
+}
+
 export default {
  name: 'FieldSubmitter',
  components: {
@@ -288,6 +300,14 @@ export default {
      ]
    },
    names () {
+      const generatedNames = []
+
+      for (let i = 21; i < 101; i++) {
+        const suffix = getOrdinalSuffix(i)
+
+        generatedNames.push(`${i}${suffix} ${this.t('party')}`)
+      }
+
      return [
        this.t('first_party'),
        this.t('second_party'),
@@ -308,7 +328,8 @@ export default {
        this.t('seventeenth_party'),
        this.t('eighteenth_party'),
        this.t('nineteenth_party'),
-        this.t('twentieth_party')
+        this.t('twentieth_party'),
+        ...generatedNames
      ]
    },
    lastPartyIndex () {
@@ -5,7 +5,7 @@
      class="roles-dropdown w-full rounded-lg"
      :style="withStickySubmitters ? { backgroundColor } : {}"
      :submitters="submitters"
-      :menu-style="{ backgroundColor: ['', null, 'transparent'].includes(backgroundColor) ? 'white' : backgroundColor }"
+      :menu-style="{ overflow: 'auto', display: 'flex', flexDirection: 'row', maxHeight: 'calc(100vh - 120px)', backgroundColor: ['', null, 'transparent'].includes(backgroundColor) ? 'white' : backgroundColor }"
      :editable="editable && !defaultSubmitters.length"
      @new-submitter="save"
      @remove="removeSubmitter"
@@ -229,6 +229,11 @@ export default {
      type: Array,
      required: true
    },
+    withFieldsSearch: {
+      type: Boolean,
+      required: false,
+      default: null
+    },
    template: {
      type: Object,
      required: true
@@ -297,7 +302,11 @@ export default {
    fieldNames: FieldType.computed.fieldNames,
    fieldIcons: FieldType.computed.fieldIcons,
    isShowFieldSearch () {
-      return this.submitterDefaultFields.length > 15
+      if (this.withFieldsSearch === false) {
+        return false
+      } else {
+        return this.submitterDefaultFields.length > 15
+      }
    },
    defaultFieldsIndex () {
      return this.defaultFields.reduce((acc, field) => {
@@ -327,7 +336,7 @@ export default {
    },
    filteredSubmitterDefaultFields () {
      if (this.defaultFieldsSearch) {
-        return this.submitterDefaultFields.filter((f) => f.name.toLowerCase().includes(this.defaultFieldsSearch.toLowerCase()))
+        return this.submitterDefaultFields.filter((f) => (f.title || f.name).toLowerCase().includes(this.defaultFieldsSearch.toLowerCase()))
      } else {
        return this.submitterDefaultFields
      }
@@ -1,4 +1,5 @@
 const en = {
+  party: 'Party',
  method: 'Method',
  reorder_fields: 'Reorder fields',
  verify_id: 'Verify ID',
@@ -160,6 +161,7 @@ const en = {
 }

 const es = {
+  party: 'Parte',
  method: 'Método',
  reorder_fields: 'Reordenar campos',
  verify_id: 'Verificar ID',
@@ -321,6 +323,7 @@ const es = {
 }

 const it = {
+  party: 'Parte',
  method: 'Metodo',
  reorder_fields: 'Riordina i campi',
  verify_id: 'Verifica ID',
@@ -482,6 +485,7 @@ const it = {
 }

 const pt = {
+  party: 'Parte',
  method: 'Método',
  reorder_fields: 'Reorganizar campos',
  verify_id: 'Verificar ID',
@@ -643,6 +647,7 @@ const pt = {
 }

 const fr = {
+  party: 'Partie',
  method: 'Méthode',
  reorder_fields: 'Réorganiser les champs',
  verify_id: "Vérifier l'ID",
@@ -804,6 +809,7 @@ const fr = {
 }

 const de = {
+  party: 'Partei',
  method: 'Verfahren',
  reorder_fields: 'Felder neu anordnen',
  verify_id: 'ID überprüfen',
@@ -5,8 +5,6 @@ class SendFormCompletedWebhookRequestJob

  sidekiq_options queue: :webhooks

-  USER_AGENT = 'DocuSeal.com Webhook'
-
  MAX_ATTEMPTS = 20

  def perform(params = {})
@@ -21,19 +19,8 @@ class SendFormCompletedWebhookRequestJob

    ActiveStorage::Current.url_options = Docuseal.default_url_options

-    resp = begin
-      Faraday.post(webhook_url.url,
-                   {
-                     event_type: 'form.completed',
-                     timestamp: Time.current,
-                     data: Submitters::SerializeForWebhook.call(submitter)
-                   }.to_json,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT,
-                   **webhook_url.secret.to_h)
-    rescue Faraday::Error
-      nil
-    end
+    resp = SendWebhookRequest.call(webhook_url, event_type: 'form.completed',
+                                                data: Submitters::SerializeForWebhook.call(submitter))

    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
       (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
@@ -5,8 +5,6 @@ class SendFormDeclinedWebhookRequestJob

  sidekiq_options queue: :webhooks

-  USER_AGENT = 'DocuSeal.com Webhook'
-
  MAX_ATTEMPTS = 10

  def perform(params = {})
@@ -19,19 +17,8 @@ class SendFormDeclinedWebhookRequestJob

    ActiveStorage::Current.url_options = Docuseal.default_url_options

-    resp = begin
-      Faraday.post(webhook_url.url,
-                   {
-                     event_type: 'form.declined',
-                     timestamp: Time.current,
-                     data: Submitters::SerializeForWebhook.call(submitter)
-                   }.to_json,
-                   **webhook_url.secret.to_h,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT)
-    rescue Faraday::Error
-      nil
-    end
+    resp = SendWebhookRequest.call(webhook_url, event_type: 'form.declined',
+                                                data: Submitters::SerializeForWebhook.call(submitter))

    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
       (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
@@ -5,8 +5,6 @@ class SendFormStartedWebhookRequestJob

  sidekiq_options queue: :webhooks

-  USER_AGENT = 'DocuSeal.com Webhook'
-
  MAX_ATTEMPTS = 10

  def perform(params = {})
@@ -19,19 +17,8 @@ class SendFormStartedWebhookRequestJob

    ActiveStorage::Current.url_options = Docuseal.default_url_options

-    resp = begin
-      Faraday.post(webhook_url.url,
-                   {
-                     event_type: 'form.started',
-                     timestamp: Time.current,
-                     data: Submitters::SerializeForWebhook.call(submitter)
-                   }.to_json,
-                   **webhook_url.secret.to_h,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT)
-    rescue Faraday::Error
-      nil
-    end
+    resp = SendWebhookRequest.call(webhook_url, event_type: 'form.started',
+                                                data: Submitters::SerializeForWebhook.call(submitter))

    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
       (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
@@ -5,8 +5,6 @@ class SendFormViewedWebhookRequestJob

  sidekiq_options queue: :webhooks

-  USER_AGENT = 'DocuSeal.com Webhook'
-
  MAX_ATTEMPTS = 10

  def perform(params = {})
@@ -19,19 +17,8 @@ class SendFormViewedWebhookRequestJob

    ActiveStorage::Current.url_options = Docuseal.default_url_options

-    resp = begin
-      Faraday.post(webhook_url.url,
-                   {
-                     event_type: 'form.viewed',
-                     timestamp: Time.current,
-                     data: Submitters::SerializeForWebhook.call(submitter)
-                   }.to_json,
-                   **webhook_url.secret.to_h,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT)
-    rescue Faraday::Error
-      nil
-    end
+    resp = SendWebhookRequest.call(webhook_url, event_type: 'form.viewed',
+                                                data: Submitters::SerializeForWebhook.call(submitter))

    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
       (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
@@ -5,8 +5,6 @@ class SendSubmissionArchivedWebhookRequestJob

  sidekiq_options queue: :webhooks

-  USER_AGENT = 'DocuSeal.com Webhook'
-
  MAX_ATTEMPTS = 10

  def perform(params = {})
@@ -17,19 +15,8 @@ class SendSubmissionArchivedWebhookRequestJob

    return if webhook_url.url.blank? || webhook_url.events.exclude?('submission.archived')

-    resp = begin
-      Faraday.post(webhook_url.url,
-                   {
-                     event_type: 'submission.archived',
-                     timestamp: Time.current,
-                     data: submission.as_json(only: %i[id archived_at])
-                   }.to_json,
-                   **webhook_url.secret.to_h,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT)
-    rescue Faraday::Error
-      nil
-    end
+    resp = SendWebhookRequest.call(webhook_url, event_type: 'submission.archived',
+                                                data: submission.as_json(only: %i[id archived_at]))

    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
       (!Docuseal.multitenant? || submission.account.account_configs.exists?(key: :plan))
@@ -5,8 +5,6 @@ class SendSubmissionCompletedWebhookRequestJob

  sidekiq_options queue: :webhooks

-  USER_AGENT = 'DocuSeal.com Webhook'
-
  MAX_ATTEMPTS = 10

  def perform(params = {})
@@ -17,19 +15,8 @@ class SendSubmissionCompletedWebhookRequestJob

    return if webhook_url.url.blank? || webhook_url.events.exclude?('submission.completed')

-    resp = begin
-      Faraday.post(webhook_url.url,
-                   {
-                     event_type: 'submission.completed',
-                     timestamp: Time.current,
-                     data: Submissions::SerializeForApi.call(submission)
-                   }.to_json,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT,
-                   **webhook_url.secret.to_h)
-    rescue Faraday::Error
-      nil
-    end
+    resp = SendWebhookRequest.call(webhook_url, event_type: 'submission.completed',
+                                                data: Submissions::SerializeForApi.call(submission))

    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
       (!Docuseal.multitenant? || submission.account.account_configs.exists?(key: :plan))
@@ -5,8 +5,6 @@ class SendSubmissionCreatedWebhookRequestJob

  sidekiq_options queue: :webhooks

-  USER_AGENT = 'DocuSeal.com Webhook'
-
  MAX_ATTEMPTS = 10

  def perform(params = {})
@@ -17,19 +15,8 @@ class SendSubmissionCreatedWebhookRequestJob

    return if webhook_url.url.blank? || webhook_url.events.exclude?('submission.created')

-    resp = begin
-      Faraday.post(webhook_url.url,
-                   {
-                     event_type: 'submission.created',
-                     timestamp: Time.current,
-                     data: Submissions::SerializeForApi.call(submission)
-                   }.to_json,
-                   **webhook_url.secret.to_h,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT)
-    rescue Faraday::Error
-      nil
-    end
+    resp = SendWebhookRequest.call(webhook_url, event_type: 'submission.created',
+                                                data: Submissions::SerializeForApi.call(submission))

    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
       (!Docuseal.multitenant? || submission.account.account_configs.exists?(key: :plan))
@@ -8,6 +8,12 @@ class SendSubmitterInvitationEmailJob

    return if submitter.submission.source == 'invite' && !Accounts.can_send_emails?(submitter.account, on_events: true)

+    unless Accounts.can_send_invitation_emails?(submitter.account)
+      Rollbar.warning("Skip email: #{submitter.account.id}") if defined?(Rollbar)
+
+      return
+    end
+
    mail = SubmitterMailer.invitation_email(submitter)

    Submitters::ValidateSending.call(submitter, mail)
@@ -17,6 +23,6 @@ class SendSubmitterInvitationEmailJob
    SubmissionEvent.create!(submitter:, event_type: 'send_email')

    submitter.sent_at ||= Time.current
-    submitter.save
+    submitter.save!
  end
 end
@@ -5,8 +5,6 @@ class SendTemplateCreatedWebhookRequestJob

  sidekiq_options queue: :webhooks

-  USER_AGENT = 'DocuSeal.com Webhook'
-
  MAX_ATTEMPTS = 10

  def perform(params = {})
@@ -17,19 +15,8 @@ class SendTemplateCreatedWebhookRequestJob

    return if webhook_url.url.blank? || webhook_url.events.exclude?('template.created')

-    resp = begin
-      Faraday.post(webhook_url.url,
-                   {
-                     event_type: 'template.created',
-                     timestamp: Time.current,
-                     data: Templates::SerializeForApi.call(template)
-                   }.to_json,
-                   **webhook_url.secret.to_h,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT)
-    rescue Faraday::Error
-      nil
-    end
+    resp = SendWebhookRequest.call(webhook_url, event_type: 'template.created',
+                                                data: Templates::SerializeForApi.call(template))

    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
       (!Docuseal.multitenant? || template.account.account_configs.exists?(key: :plan))
@@ -5,8 +5,6 @@ class SendTemplateUpdatedWebhookRequestJob

  sidekiq_options queue: :webhooks

-  USER_AGENT = 'DocuSeal.com Webhook'
-
  MAX_ATTEMPTS = 10

  def perform(params = {})
@@ -17,19 +15,8 @@ class SendTemplateUpdatedWebhookRequestJob

    return if webhook_url.url.blank? || webhook_url.events.exclude?('template.updated')

-    resp = begin
-      Faraday.post(webhook_url.url,
-                   {
-                     event_type: 'template.updated',
-                     timestamp: Time.current,
-                     data: Templates::SerializeForApi.call(template)
-                   }.to_json,
-                   **webhook_url.secret.to_h,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT)
-    rescue Faraday::Error
-      nil
-    end
+    resp = SendWebhookRequest.call(webhook_url, event_type: 'template.updated',
+                                                data: Templates::SerializeForApi.call(template))

    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
       (!Docuseal.multitenant? || template.account.account_configs.exists?(key: :plan))
@@ -2,6 +2,9 @@
 <html data-theme="docuseal" lang="<%= I18n.locale %>">
  <head>
    <%= render 'layouts/head_tags' %>
+    <% if Docuseal.enable_pwa? %>
+      <link rel="manifest" href="/manifest.json">
+    <% end %>
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
    <%= csrf_meta_tags %>
    <%= csp_meta_tag %>
@@ -0,0 +1,25 @@
+{
+  "name": "<%= Docuseal.product_name %>",
+  "short_name": "<%= Docuseal.product_name %>",
+  "id": "/",
+  "icons": [
+    {
+      "src": "/logo.svg",
+      "type": "image/svg+xml",
+      "sizes": "any"
+    },
+    {
+      "src": "/apple-touch-icon.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    }
+  ],
+  "start_url": "/",
+  "display": "standalone",
+  "scope": "/",
+  "orientation": "natural",
+  "description": "<%= Docuseal.product_name %> is an open source platform that provides secure and efficient digital document signing and processing.",
+  "categories": ["productivity", "utilities"],
+  "theme_color": "#FAF7F4",
+  "background_color": "#FAF7F4"
+}
@@ -2,5 +2,9 @@
  ---
 </p>
 <p>
-  <%= t('sent_using_product_name_free_document_signing_html', product_url: "#{Docuseal::PRODUCT_EMAIL_URL}/start", product_name: Docuseal.product_name) %>
+  <% if @current_account&.testing? %>
+    <%= t('sent_using_product_name_in_testing_mode_html', product_url: "#{Docuseal::PRODUCT_EMAIL_URL}/start", product_name: Docuseal.product_name) %>
+  <% else %>
+    <%= t('sent_using_product_name_free_document_signing_html', product_url: "#{Docuseal::PRODUCT_EMAIL_URL}/start", product_name: Docuseal.product_name) %>
+  <% end %>
 </p>
@@ -1,3 +1,4 @@
+<%= render 'shared/navbar_warning' %>
 <div class="max-w-6xl mb-4 mx-auto px-4 md:px-2 py-3 flex items-center justify-between">
  <div class="flex items-center space-x-4">
    <a href="<%= root_path %>" class="text-2xl font-bold items-center flex space-x-2">
@@ -118,7 +118,7 @@
          <div class="group border border-base-300 rounded-md px-2 py-1 mb-1">
            <div class="flex items-center justify-between">
              <div class="flex items-center space-x-1">
-                <span class="mx-1 w-3 h-3 shrink-0 rounded-full <%= colors[index] %>"></span>
+                <span class="mx-1 w-3 h-3 shrink-0 rounded-full <%= colors[index % 10] %>"></span>
                <span class="text-lg" dir="auto">
                  <%= (@submission.template_submitters || @submission.template.submitters).find { |e| e['uuid'] == submitter&.uuid }&.dig('name') || "#{(index + 1).ordinalize} Submitter" %>
                </span>
@@ -190,6 +190,11 @@
                </a>
              </div>
            <% end %>
+            <% if signed_in? && submitter && submitter.completed_at? && submitter.email == current_user.email && submitter.completed_at > 1.month.ago && can?(:update, @submission) %>
+              <div class="mt-2 mb-1">
+                <%= button_to t('resubmit'), submitters_resubmit_path(submitter), method: :put, class: 'btn btn-sm btn-primary w-full', form: { target: '_blank' }, data: { turbo: false } %>
+              </div>
+            <% end %>
          </div>
        </div>
        <div class="px-1.5 mb-4">
@@ -1,5 +1,5 @@
 <% data_attachments = attachments_index.values.select { |e| e.record_id == submitter.id }.to_json(only: %i[uuid created_at], methods: %i[url filename content_type]) %>
-<% data_fields = (submitter.submission.template_fields || submitter.submission.template.fields).select { |f| f['submitter_uuid'] == submitter.uuid }.to_json %>
+<% data_fields = Submissions.filtered_conditions_fields(submitter).to_json %>
 <% invite_submitters = (submitter.submission.template_submitters || submitter.submission.template.submitters).select { |s| s['invite_by_uuid'] == submitter.uuid && submitter.submission.submitters.none? { |e| e.uuid == s['uuid'] } }.to_json %>
 <% optional_invite_submitters = (submitter.submission.template_submitters || submitter.submission.template.submitters).select { |s| s['optional_invite_by_uuid'] == submitter.uuid && submitter.submission.submitters.none? { |e| e.uuid == s['uuid'] } }.to_json %>
 <submission-form data-is-demo="<%= Docuseal.demo? %>" data-schema="<%= schema.to_json %>" data-reuse-signature="<%= configs[:reuse_signature] %>" data-require-signing-reason="<%= configs[:require_signing_reason] %>" data-with-signature-id="<%= configs[:with_signature_id] %>" data-with-confetti="<%= configs[:with_confetti] %>" data-completed-redirect-url="<%= submitter.preferences['completed_redirect_url'].presence || submitter.submission.template.preferences['completed_redirect_url'] %>" data-completed-message="<%= (configs[:completed_message]&.compact_blank.presence || submitter.submission.template.preferences['completed_message'] || {}).to_json %>" data-completed-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.preferences.key?('go_to_last') ? submitter.preferences['go_to_last'] : submitter.opened_at? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(submitter.submission.account) %>" data-optional-invite-submitters="<%= optional_invite_submitters %>" data-invite-submitters="<%= invite_submitters %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>" data-previous-signature-value="<%= local_assigns[:signature_attachment]&.uuid %>" data-remember-signature="<%= configs[:prefill_signature] %>" data-dry-run="<%= local_assigns[:dry_run] %>" data-expand="<%= local_assigns[:expand] %>" data-scroll-padding="<%= local_assigns[:scroll_padding] %>" data-language="<%= I18n.locale.to_s.split('-').first %>"></submission-form>
@@ -42,7 +42,8 @@
        </download-button>
      <% end %>
    </div>
-    <% if Templates.filter_undefined_submitters(@submitter.submission.template).size == 1 && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && !@submitter.template.archived_at? %>
+    <% undefined_submitters = Templates.filter_undefined_submitters(@submitter.submission.template) %>
+    <% if undefined_submitters.size == 1 && undefined_submitters.first['uuid'] == @submitter.uuid && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && !@submitter.template.archived_at? %>
      <div class="divider uppercase"><%= t('or') %></div>
      <toggle-submit class="block">
        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@submitter.submission.template.slug), params: { submitter: { email: @submitter.email, phone: @submitter.phone, name: @submitter.name }, resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>
@@ -2,7 +2,7 @@
 <% if Docuseal.demo? %><%= render 'shared/demo_alert' %><% end %>
 <div class="flex justify-between items-center w-full mb-4">
  <div class="flex items-center flex-grow min-w-0">
-    <% if has_archived || @pagy.count > 0 %>
+    <% if has_archived || @pagy.count > 0 || @template_folders.present? %>
      <div class="mr-2">
        <%= render 'dashboard/toggle_view', selected: 'templates' %>
      </div>
@@ -60,7 +60,7 @@
                </span>
              </td>
              <td>
-                <%= user.last_sign_in_at ? l(user.last_sign_in_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) : '-' %>
+                <%= user.current_sign_in_at ? l(user.current_sign_in_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) : '-' %>
              </td>
              <td class="flex items-center space-x-2 justify-end">
                <% if params[:status].blank? && can?(:update, user) && user.archived_at.blank? %>
@@ -42,6 +42,7 @@ en: &en
  hello_name: Hello %{name}
  you_are_invited_to_product_name: You are invited to %{product_name}
  you_have_been_invited_to_account_name_product_name_please_sign_up_using_the_link_below_: 'You have been invited to %{account_name} %{product_name}. Please sign up using the link below:'
+  sent_using_product_name_in_testing_mode_html: 'Sent using <a href="%{product_url}">%{product_name}</a> in testing mode'
  sent_using_product_name_free_document_signing_html: 'Sent using <a href="%{product_url}">%{product_name}</a> free document signing.'
  sign_documents_with_trusted_certificate_provided_by_docu_seal_your_documents_and_data_are_never_shared_with_docu_seal_p_d_f_checksum_is_provided_to_generate_a_trusted_signature: Sign documents with trusted certificate provided by DocuSeal. Your documents and data are never shared with DocuSeal. PDF checksum is provided to generate a trusted signature.
  you_have_been_invited_to_submit_the_name_form: 'You have been invited to submit the "%{name}" form.'
@@ -165,7 +166,7 @@ en: &en
  schedule_account_for_deletion_: Schedule account for deletion?
  account_information_has_been_updated: Account information has been updated.
  should_be_a_valid_url: should be a valid URL
-  your_account_removal_request_will_be_processed_within_2_weeks_please_contact_us_if_you_want_to_keep_your_account: Your account removal request will be processed within 2 weeks. Please contact us if you want to keep your account.
+  your_account_removal_request_will_be_processed_within_2_months_please_contact_us_if_you_want_to_keep_your_account: Your account removal request will be processed within 2 months. Please contact us if you want to keep your account.
  test_mode: Test mode
  copy: Copy
  copied: Copied
@@ -688,6 +689,11 @@ en: &en
  tell_us_more_about_your_experience: Tell us more about your experience
  extremely_dissatisfied: Extremely Dissatisfied
  extremely_satisfied: Extremely Satisfied
+  your_pro_plan_payment_is_overdue: Your Pro plan payment is overdue.
+  click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html: <a href="%{url}" class="link">Click here</a> to update your payment details and clear the invoice to ensure uninterrupted service.
+  overdue_payment: Overdue Payment
+  your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Your Pro Plan has been suspended due to unpaid invoices. You can update your payment details to settle the invoice and continue using DocuSeal or cancel your subscription.
+  manage_subscription: Manage Subscription
  submission_event_names:
    send_email_to_html: '<b>Email sent</b> to %{submitter_name}'
    send_reminder_email_to_html: '<b>Reminder email sent</b> to %{submitter_name}'
@@ -750,6 +756,7 @@ es: &es
  hello_name: Hola %{name}
  you_are_invited_to_product_name: Estás invitado a %{product_name}
  you_have_been_invited_to_account_name_product_name_please_sign_up_using_the_link_below_: 'Has sido invitado a %{account_name} %{product_name}. Por favor, regístrate usando el enlace a continuación:'
+  sent_using_product_name_in_testing_mode_html: 'Enviado usando <a href="%{product_url}">%{product_name}</a> en Modo de Prueba'
  sent_using_product_name_free_document_signing_html: 'Enviado usando la firma de documentos gratuita de <a href="%{product_url}">%{product_name}</a>.'
  sign_documents_with_trusted_certificate_provided_by_docu_seal_your_documents_and_data_are_never_shared_with_docu_seal_p_d_f_checksum_is_provided_to_generate_a_trusted_signature: Firme documentos con un certificado de confianza proporcionado por DocuSeal. Sus documentos y datos nunca se comparten con DocuSeal. Se proporciona un checksum de PDF para generar una firma de confianza.
  hi_there: Hola
@@ -873,7 +880,7 @@ es: &es
  schedule_account_for_deletion_: ¿Programar la eliminación de la cuenta?
  account_information_has_been_updated: La información de la cuenta ha sido actualizada.
  should_be_a_valid_url: debe ser una URL válida
-  your_account_removal_request_will_be_processed_within_2_weeks_please_contact_us_if_you_want_to_keep_your_account: Tu solicitud de eliminación de cuenta se procesará en un plazo de 2 semanas. Por favor contáctanos si deseas mantener tu cuenta.
+  your_account_removal_request_will_be_processed_within_2_months_please_contact_us_if_you_want_to_keep_your_account: Tu solicitud de eliminación de cuenta se procesará en un plazo de 2 meses. Por favor contáctanos si deseas mantener tu cuenta.
  test_mode: Modo de prueba
  copy: Copiar
  copied: Copiado
@@ -1396,6 +1403,11 @@ es: &es
  tell_us_more_about_your_experience: Cuéntanos más sobre tu experiencia
  extremely_dissatisfied: Extremadamente insatisfecho
  extremely_satisfied: Extremadamente satisfecho
+  your_pro_plan_payment_is_overdue: El pago de tu plan Pro está atrasado.
+  click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html: '<a href="%{url}" class="link">Haz clic aquí</a> para actualizar tus datos de pago y liquidar la factura para garantizar un servicio ininterrumpido.'
+  overdue_payment: Pago Atrasado
+  your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Tu plan Pro ha sido suspendido debido a facturas impagas. Puedes actualizar tus datos de pago para liquidar la factura y seguir usando DocuSeal o cancelar tu suscripción.
+  manage_subscription: Gestionar Suscripción
  submission_event_names:
    send_email_to_html: '<b>Correo electrónico enviado</b> a %{submitter_name}'
    send_reminder_email_to_html: '<b>Correo de recordatorio enviado</b> a %{submitter_name}'
@@ -1457,6 +1469,7 @@ it: &it
  hello_name: Ciao %{name}
  you_are_invited_to_product_name: Sei stato invitato a %{product_name}
  you_have_been_invited_to_account_name_product_name_please_sign_up_using_the_link_below_: 'Sei stato invitato a %{account_name} %{product_name}. Registrati utilizzando il link qui sotto:'
+  sent_using_product_name_in_testing_mode_html: 'Inviato utilizzando <a href="%{product_url}">%{product_name}</a> in Modalità di Test'
  sent_using_product_name_free_document_signing_html: 'Inviato utilizzando la firma di documenti gratuita di <a href="%{product_url}">%{product_name}</a>.'
  sign_documents_with_trusted_certificate_provided_by_docu_seal_your_documents_and_data_are_never_shared_with_docu_seal_p_d_f_checksum_is_provided_to_generate_a_trusted_signature: "Firma documenti con un certificato di fiducia fornito da DocuSeal. I tuoi documenti e i tuoi dati non vengono mai condivisi con DocuSeal. Il checksum PDF è fornito per generare una firma di fiducia."
  hi_there: Ciao
@@ -1580,7 +1593,7 @@ it: &it
  schedule_account_for_deletion_: "Programmare l'eliminazione dell'account?"
  account_information_has_been_updated: "Le informazioni dell'account sono state aggiornate."
  should_be_a_valid_url: deve essere un URL valido
-  your_account_removal_request_will_be_processed_within_2_weeks_please_contact_us_if_you_want_to_keep_your_account: "La tua richiesta di rimozione dell'account sarà elaborata entro 2 settimane. Contattaci se desideri mantenere il tuo account."
+  your_account_removal_request_will_be_processed_within_2_months_please_contact_us_if_you_want_to_keep_your_account: "La tua richiesta di rimozione dell'account sarà elaborata entro 2 mesi. Contattaci se desideri mantenere il tuo account."
  test_mode: Modalità di test
  copy: Copia
  copied: Copiato
@@ -2103,6 +2116,11 @@ it: &it
  tell_us_more_about_your_experience: Raccontaci di più sulla tua esperienza
  extremely_dissatisfied: Estremamente insoddisfatto
  extremely_satisfied: Estremamente soddisfatto
+  your_pro_plan_payment_is_overdue: Il pagamento del tuo piano Pro è in ritardo.
+  click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html: '<a href="%{url}" class="link">Fai clic qui</a> per aggiornare i tuoi dati di pagamento e saldare la fattura per garantire un servizio ininterrotto.'
+  overdue_payment: Pagamento Scaduto
+  your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Il tuo piano Pro è stato sospeso a causa di fatture non pagate. Puoi aggiornare i tuoi dati di pagamento per saldare la fattura e continuare a utilizzare DocuSeal o annullare l'abbonamento.
+  manage_subscription: Gestisci Abbonamento
  submission_event_names:
    send_email_to_html: '<b>E-mail inviato</b> a %{submitter_name}'
    send_reminder_email_to_html: '<b>E-mail di promemoria inviato</b> a %{submitter_name}'
@@ -2165,6 +2183,7 @@ fr: &fr
  hello_name: Bonjour %{name}
  you_are_invited_to_product_name: Vous êtes invité à %{product_name}
  you_have_been_invited_to_account_name_product_name_please_sign_up_using_the_link_below_: 'Vous avez été invité à %{account_name} %{product_name}. Veuillez vous inscrire en utilisant le lien ci-dessous:'
+  sent_using_product_name_in_testing_mode_html: 'Envoyé en utilisant <a href="%{product_url}">%{product_name}</a> en Mode Test'
  sent_using_product_name_free_document_signing_html: 'Envoyé en utilisant la signature de documents gratuite de <a href="%{product_url}">%{product_name}</a>.'
  sign_documents_with_trusted_certificate_provided_by_docu_seal_your_documents_and_data_are_never_shared_with_docu_seal_p_d_f_checksum_is_provided_to_generate_a_trusted_signature: Signez des documents avec un certificat de confiance fourni par DocuSeal. Vos documents et données ne sont jamais partagés avec DocuSeal. Un checksum PDF est fourni pour générer une signature de confiance.
  hi_there: Bonjour
@@ -2289,7 +2308,7 @@ fr: &fr
  schedule_account_for_deletion_: Programmer la suppression du compte?
  account_information_has_been_updated: Les informations du compte ont été mises à jour.
  should_be_a_valid_url: doit être une URL valide
-  your_account_removal_request_will_be_processed_within_2_weeks_please_contact_us_if_you_want_to_keep_your_account: Votre demande de suppression du compte sera traitée dans un délai de 2 semaines. Veuillez nous contacter si vous souhaitez conserver votre compte.
+  your_account_removal_request_will_be_processed_within_2_months_please_contact_us_if_you_want_to_keep_your_account: Votre demande de suppression du compte sera traitée dans un délai de 2 mois. Veuillez nous contacter si vous souhaitez conserver votre compte.
  test_mode: Mode test
  copy: Copier
  copied: Copié
@@ -2812,6 +2831,11 @@ fr: &fr
  tell_us_more_about_your_experience: Parlez-nous davantage de votre expérience
  extremely_dissatisfied: Extrêmement insatisfait
  extremely_satisfied: Extrêmement satisfait
+  your_pro_plan_payment_is_overdue: Le paiement de votre plan Pro est en retard.
+  click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html: '<a href="%{url}" class="link">Cliquez ici</a> pour mettre à jour vos informations de paiement et régler la facture afin de garantir un service ininterrompu.'
+  overdue_payment: Paiement En Retard
+  your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Votre plan Pro a été suspendu en raison de factures impayées. Vous pouvez mettre à jour vos informations de paiement pour régler la facture et continuer à utiliser DocuSeal ou annuler votre abonnement.
+  manage_subscription: Gérer l'Abonnement
  submission_event_names:
    send_email_to_html: '<b>E-mail envoyé</b> à %{submitter_name}'
    send_reminder_email_to_html: '<b>E-mail de rappel envoyé</b> à %{submitter_name}'
@@ -2874,6 +2898,7 @@ pt: &pt
  hello_name: Olá %{name}
  you_are_invited_to_product_name: Você está convidado para %{product_name}
  you_have_been_invited_to_account_name_product_name_please_sign_up_using_the_link_below_: 'Você foi convidado para %{account_name} %{product_name}. Inscreva-se usando o link abaixo:'
+  sent_using_product_name_in_testing_mode_html: 'Enviado usando <a href="%{product_url}">%{product_name}</a> no Modo de Teste'
  sent_using_product_name_free_document_signing_html: 'Enviado usando a assinatura gratuita de documentos de <a href="%{product_url}">%{product_name}</a>.'
  sign_documents_with_trusted_certificate_provided_by_docu_seal_your_documents_and_data_are_never_shared_with_docu_seal_p_d_f_checksum_is_provided_to_generate_a_trusted_signature: Assine documentos com certificado confiável fornecido pela DocuSeal. Seus documentos e dados nunca são compartilhados com a DocuSeal. O checksum do PDF é fornecido para gerar uma assinatura confiável.
  hi_there: Olá
@@ -2997,7 +3022,7 @@ pt: &pt
  schedule_account_for_deletion_: Agendar exclusão da conta?
  account_information_has_been_updated: As informações da conta foram atualizadas.
  should_be_a_valid_url: deve ser um URL válido
-  your_account_removal_request_will_be_processed_within_2_weeks_please_contact_us_if_you_want_to_keep_your_account: Seu pedido de remoção da conta será processado em até 2 semanas. Entre em contato conosco se você quiser manter sua conta.
+  your_account_removal_request_will_be_processed_within_2_months_please_contact_us_if_you_want_to_keep_your_account: Seu pedido de remoção da conta será processado em até 2 meses. Entre em contato conosco se você quiser manter sua conta.
  test_mode: Modo de teste
  copy: Copiar
  copied: Copiado
@@ -3520,6 +3545,11 @@ pt: &pt
  tell_us_more_about_your_experience: Conte-nos mais sobre sua experiência
  extremely_dissatisfied: Extremamente insatisfeito
  extremely_satisfied: Extremamente satisfeito
+  your_pro_plan_payment_is_overdue: O pagamento do seu plano Pro está atrasado.
+  click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html: '<a href="%{url}" class="link">Clique aqui</a> para atualizar seus dados de pagamento e quitar a fatura para garantir um serviço ininterrupto.'
+  overdue_payment: Pagamento Atrasado
+  your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Seu plano Pro foi suspenso devido a faturas não pagas. Você pode atualizar seus dados de pagamento para quitar a fatura e continuar usando o DocuSeal ou cancelar sua assinatura.
+  manage_subscription: Gerenciar Assinatura
  submission_event_names:
    send_email_to_html: '<b>E-mail enviado</b> para %{submitter_name}'
    send_reminder_email_to_html: '<b>E-mail de lembrete enviado</b> para %{submitter_name}'
@@ -3582,6 +3612,7 @@ de: &de
  hello_name: Hallo %{name}
  you_are_invited_to_product_name: Sie sind eingeladen zu %{product_name}
  you_have_been_invited_to_account_name_product_name_please_sign_up_using_the_link_below_: 'Sie wurden zu %{account_name} %{product_name} eingeladen. Bitte registrieren Sie sich über den folgenden Link:'
+  sent_using_product_name_in_testing_mode_html: 'Gesendet über <a href="%{product_url}">%{product_name}</a> im Testmodus'
  sent_using_product_name_free_document_signing_html: 'Gesendet mit der kostenlosen Dokumentensignierung von <a href="%{product_url}">%{product_name}</a>.'
  sign_documents_with_trusted_certificate_provided_by_docu_seal_your_documents_and_data_are_never_shared_with_docu_seal_p_d_f_checksum_is_provided_to_generate_a_trusted_signature: Unterzeichnen Sie Dokumente mit einem vertrauenswürdigen Zertifikat von DocuSeal. Ihre Dokumente und Daten werden niemals mit DocuSeal geteilt. Eine PDF-Prüfziffer wird bereitgestellt, um eine vertrauenswürdige Signatur zu generieren.
  hi_there: Hallo
@@ -3705,7 +3736,7 @@ de: &de
  schedule_account_for_deletion_: Konto zur Löschung einplanen?
  account_information_has_been_updated: Die Kontoinformationen wurden aktualisiert.
  should_be_a_valid_url: sollte eine gültige URL sein
-  your_account_removal_request_will_be_processed_within_2_weeks_please_contact_us_if_you_want_to_keep_your_account: Deine Anfrage zur Kontolöschung wird innerhalb von 2 Wochen bearbeitet. Bitte kontaktiere uns, wenn du dein Konto behalten möchtest.
+  your_account_removal_request_will_be_processed_within_2_months_please_contact_us_if_you_want_to_keep_your_account: Deine Anfrage zur Kontolöschung wird innerhalb von 2 Monaten bearbeitet. Bitte kontaktiere uns, wenn du dein Konto behalten möchtest.
  test_mode: Testmodus
  copy: Kopieren
  copied: Kopiert
@@ -4228,6 +4259,11 @@ de: &de
  tell_us_more_about_your_experience: Erzählen Sie uns mehr über Ihre Erfahrung
  extremely_dissatisfied: Extrem unzufrieden
  extremely_satisfied: Extrem zufrieden
+  your_pro_plan_payment_is_overdue: Ihre Zahlung für den Pro-Plan ist überfällig.
+  click_here_to_update_your_payment_details_and_clear_the_invoice_to_ensure_uninterrupted_service_html: '<a href="%{url}" class="link">Klicken Sie hier</a>, um Ihre Zahlungsdaten zu aktualisieren und die Rechnung zu begleichen, um einen unterbrechungsfreien Service sicherzustellen.'
+  overdue_payment: Überfällige Zahlung
+  your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Ihr Pro-Plan wurde aufgrund unbezahlter Rechnungen ausgesetzt. Sie können Ihre Zahlungsdaten aktualisieren, um die Rechnung zu begleichen und DocuSeal weiterhin zu nutzen, oder Ihr Abonnement kündigen.
+  manage_subscription: Abonnement Verwalten
  submission_event_names:
    send_email_to_html: '<b>E-Mail gesendet</b> an %{submitter_name}'
    send_reminder_email_to_html: '<b>Erinnerungs-E-Mail gesendet</b> an %{submitter_name}'
@@ -12,6 +12,7 @@ Rails.application.routes.draw do
  root 'dashboard#index'

  get 'up' => 'rails/health#show'
+  get 'manifest' => 'pwa#manifest'

  devise_for :users,
             path: '/', only: %i[sessions passwords omniauth_callbacks],
@@ -79,6 +80,7 @@ Rails.application.routes.draw do
  resource :testing_account, only: %i[show destroy]
  resources :testing_api_settings, only: %i[index]
  resources :submitters_autocomplete, only: %i[index]
+  resources :submitters_resubmit, only: %i[update]
  resources :template_folders_autocomplete, only: %i[index]
  resources :webhook_secret, only: %i[show update]
  resources :webhook_preferences, only: %i[update]
@@ -25,7 +25,7 @@ module Abilities
      account_ids = [user.account_id, TemplateSharing::ALL_ID]

      template.template_sharings.any? do |e|
-        e.account_id.in?(account_ids) && (ability.nil? || e.ability == ability)
+        e.account_id.in?(account_ids) && (ability.nil? || e.ability == 'manage' || e.ability == ability)
      end
    end
  end
@@ -153,6 +153,10 @@ module Accounts
    EncryptedConfig.exists?(key: EncryptedConfig::EMAIL_SMTP_KEY)
  end

+  def can_send_invitation_emails?(_account)
+    true
+  end
+
  def normalize_timezone(timezone)
    tzinfo = TZInfo::Timezone.get(ActiveSupport::TimeZone::MAPPING[timezone] || timezone)

@@ -69,6 +69,10 @@ module Docuseal
    @default_pkcs ||= GenerateCertificate.load_pkcs(Docuseal::CERTS)
  end

+  def enable_pwa?
+    true
+  end
+
  def trusted_certs
    @trusted_certs ||=
      ENV['TRUSTED_CERTS'].to_s.gsub('\\n', "\n").split("\n\n").map do |base64|
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module SendWebhookRequest
+  USER_AGENT = 'DocuSeal.com Webhook'
+
+  module_function
+
+  def call(webhook_url, event_type:, data:)
+    Faraday.post(webhook_url.url) do |req|
+      req.headers['Content-Type'] = 'application/json'
+      req.headers['User-Agent'] = USER_AGENT
+      req.headers.merge!(webhook_url.secret.to_h) if webhook_url.secret.present?
+
+      req.body = {
+        event_type: event_type,
+        timestamp: Time.current,
+        data: data
+      }.to_json
+
+      req.options.read_timeout = 8
+      req.options.open_timeout = 8
+    end
+  rescue Faraday::Error
+    nil
+  end
+end
@@ -107,20 +107,27 @@ module Submissions

  def normalize_email(email)
    return if email.blank?
-    return email.downcase if email.to_s.include?(',')
-    return email.downcase if email.to_s.include?('.gob')
-    return email.downcase if email.to_s.include?('.om')
-    return email.downcase if email.to_s.include?('.mm')
-    return email.downcase if email.to_s.include?('.cm')
-    return email.downcase if email.to_s.include?('.et')
-    return email.downcase if email.to_s.include?('.mo')
-    return email.downcase if email.to_s.include?('.nz')
-    return email.downcase if email.to_s.include?('.za')
-    return email.downcase unless email.to_s.include?('.')
+
+    return email.downcase if email.to_s.include?(',') ||
+                             email.to_s.match?(/\.(?:gob|om|mm|cm|et|mo|nz|za|ie)\z/) ||
+                             email.to_s.exclude?('.')

    fixed_email = EmailTypo.call(email.delete_prefix('<'))

-    Rails.logger.info("Fixed email #{email.split('@').last}") if fixed_email != email.downcase.delete_prefix('<').strip
+    return fixed_email if fixed_email == email
+
+    domain = email.to_s.split('@').last.to_s.downcase
+    fixed_domain = fixed_email.to_s.split('@').last
+
+    return email.downcase if domain == fixed_domain
+
+    if DidYouMean::Levenshtein.distance(domain, fixed_domain) > 3
+      Rails.logger.info("Skipped email fix #{domain}")
+
+      return email.downcase
+    end
+
+    Rails.logger.info("Fixed email #{domain}") if fixed_email != email.downcase.delete_prefix('<').strip

    fixed_email
  end
@@ -135,31 +142,57 @@ module Submissions

        values ||= submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) }

-        next unless check_document_conditions(item, values, fields_uuid_index, include_submitter_uuid:)
+        next unless check_item_conditions(item, values, fields_uuid_index, include_submitter_uuid:)
      end

      item
    end
  end

-  def check_document_conditions(item, values, fields_index, include_submitter_uuid: nil)
+  def filtered_conditions_fields(submitter, only_submitter_fields: true)
+    fields = submitter.submission.template_fields || submitter.submission.template.fields
+
+    fields_uuid_index = nil
+    values = nil
+
+    fields.filter_map do |field|
+      next if field['submitter_uuid'] != submitter.uuid && only_submitter_fields
+
+      if field['conditions'].present?
+        fields_uuid_index ||= fields.index_by { |f| f['uuid'] }
+        values ||= submitter.submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) }
+
+        submitter_conditions = []
+
+        next unless check_item_conditions(field, values, fields_uuid_index,
+                                          include_submitter_uuid: submitter.uuid,
+                                          submitter_conditions_acc: submitter_conditions)
+
+        field = field.merge('conditions' => submitter_conditions) if submitter_conditions != field['conditions']
+      end
+
+      field
+    end
+  end
+
+  def check_item_conditions(item, values, fields_index, include_submitter_uuid: nil, submitter_conditions_acc: nil)
    return true if item['conditions'].blank?

-    item['conditions'].all? do |condition|
+    item['conditions'].each_with_object([]) do |condition, acc|
      result =
        if fields_index[condition['field_uuid']]['submitter_uuid'] == include_submitter_uuid
+          submitter_conditions_acc << condition if submitter_conditions_acc
+
          true
        else
          Submitters::SubmitValues.check_field_condition(condition, values, fields_index)
        end

-      item['conditions'].each_with_object([]) do |c, acc|
-        if c['operation'] == 'or'
-          acc.push(acc.pop || result)
-        else
-          acc.push(result)
-        end
-      end.exclude?(false)
-    end
+      if condition['operation'] == 'or'
+        acc.push(acc.pop || result)
+      else
+        acc.push(result)
+      end
+    end.exclude?(false)
  end
 end
@@ -18,7 +18,7 @@ module Submitters

    def find_or_create_signature_from_value(submitter, value, attachments)
      _, attachment = Submitters::NormalizeValues.normalize_attachment_value(value,
-                                                                             'signature',
+                                                                             { 'type' => 'signature' },
                                                                             submitter.account,
                                                                             attachments,
                                                                             submitter)
@@ -40,7 +40,7 @@ module Submitters

        if field['type'].in?(%w[initials signature image file stamp]) && value.present?
          new_value, new_attachments =
-            normalize_attachment_value(value, field['type'], template.account, attachments, for_submitter)
+            normalize_attachment_value(value, field, template.account, attachments, for_submitter)

          attachments.push(*new_attachments)

@@ -109,17 +109,17 @@ module Submitters
            .merge(fields.index_by { |e| e['name'].to_s.downcase })
    end

-    def normalize_attachment_value(value, type, account, attachments, for_submitter = nil)
+    def normalize_attachment_value(value, field, account, attachments, for_submitter = nil)
      if value.is_a?(Array)
        new_attachments = value.map do |v|
-          new_attachment = find_or_build_attachment(v, type, account, for_submitter)
+          new_attachment = find_or_build_attachment(v, field, account, for_submitter)

          attachments.find { |a| a.blob_id == new_attachment.blob_id } || new_attachment
        end

        [new_attachments.map(&:uuid), new_attachments]
      else
-        new_attachment = find_or_build_attachment(value, type, account, for_submitter)
+        new_attachment = find_or_build_attachment(value, field, account, for_submitter)

        existing_attachment = attachments.find { |a| a.blob_id == new_attachment.blob_id }

@@ -129,7 +129,9 @@ module Submitters
      end
    end

-    def find_or_build_attachment(value, type, account, for_submitter = nil)
+    def find_or_build_attachment(value, field, account, for_submitter = nil)
+      type = field['type']
+
      blob =
        if value.match?(%r{\Ahttps?://})
          find_or_create_blob_from_url(account, value)
@@ -138,6 +140,8 @@ module Submitters
        elsif (data = Base64.decode64(value.sub(BASE64_PREFIX_REGEXP, ''))) &&
              Marcel::MimeType.for(data).exclude?('octet-stream')
          find_or_create_blob_from_base64(account, data, type)
+        elsif type == 'image' && (value.starts_with?('<html>') || value.starts_with?('<!DOCTYPE'))
+          find_or_create_blob_from_html(account, value, field)
        else
          raise InvalidDefaultValue, "Invalid value, url, base64 or text < 60 chars is expected: #{value.first(200)}..."
        end
@@ -152,6 +156,10 @@ module Submitters
      attachment
    end

+    def find_or_create_blob_from_html(_account, value, _field)
+      raise InvalidDefaultValue, "HTML content is not allowed: #{value.first(200)}..."
+    end
+
    def find_or_create_blob_from_base64(account, data, type)
      checksum = Digest::MD5.base64digest(data)

@@ -186,10 +186,21 @@ module Submitters
      attachments_index =
        Submissions.filtered_conditions_schema(submitter.submission).index_by { |i| i['attachment_uuid'] }

+      submitter_values = nil
+      is_other_submitter_conditions = submitter.submission.template_submitters.size > 1
+
      submitter.submission.template_fields.each do |field|
        next if field['submitter_uuid'] != submitter.uuid

-        submitter.values.delete(field['uuid']) unless check_field_conditions(submitter, field, fields_uuid_index)
+        submitter_values ||= submitter.values
+
+        is_other_submitter_conditions &&= field_conditions_other_submitter?(submitter, field, fields_uuid_index)
+
+        if is_other_submitter_conditions
+          submitter_values = submitter.submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) }
+        end
+
+        submitter.values.delete(field['uuid']) unless check_field_conditions(submitter_values, field, fields_uuid_index)

        if field['areas'].present? && field['areas'].none? { |area| attachments_index[area['attachment_uuid']] }
          submitter.values.delete(field['uuid'])
@@ -199,10 +210,14 @@ module Submitters
      submitter.values
    end

-    def check_field_conditions(submitter, field, fields_uuid_index)
-      return true if field['conditions'].blank?
+    def field_conditions_other_submitter?(submitter, field, fields_uuid_index)
+      field['conditions'].to_a.any? do |c|
+        fields_uuid_index.dig(c['field_uuid'], 'submitter_uuid') != submitter.uuid
+      end
+    end

-      submitter_values = submitter.values
+    def check_field_conditions(submitter_values, field, fields_uuid_index)
+      return true if field['conditions'].blank?

      field['conditions'].each_with_object([]) do |c, acc|
        if c['operation'] == 'or'
@@ -0,0 +1,11 @@
+self.addEventListener('install', () => {
+  console.log('DocuSeal App installed')
+})
+
+self.addEventListener('activate', () => {
+  console.log('DocuSeal App activated')
+})
+
+self.addEventListener('fetch', (event) => {
+  event.respondWith(fetch(event.request))
+})
Author	SHA1	Message	Date
Alex Turchyn	6e685bbc32	Merge from docusealco/wip	2025-02-05 13:44:10 +02:00
Pete Matsyburka	0b3ca0de96	fix ci	2025-02-04 19:37:42 +02:00
Pete Matsyburka	aed3f1f141	fix build	2025-02-04 18:47:15 +02:00
Pete Matsyburka	1a7981e919	update actions	2025-02-04 16:55:24 +02:00
Pete Matsyburka	4add805371	fix field align	2025-02-04 16:19:49 +02:00
Alex Turchyn	66c18317b7	Merge from docusealco/wip	2025-02-04 16:11:47 +02:00
Pete Matsyburka	9edbb885b4	use arm runner	2025-02-04 15:51:31 +02:00
Alex Turchyn	c67c80d6bc	Merge from docusealco/wip	2025-02-04 13:44:17 +02:00
Pete Matsyburka	0399531e0c	html image	2025-02-03 18:38:52 +02:00
Pete Matsyburka	54426556d9	field conditions	2025-02-02 21:36:38 +02:00
Alex Turchyn	fa74ee1755	add Progressive Web App	2025-02-02 14:31:42 +02:00
Pete Matsyburka	eb53af12c4	adjust form	2025-02-02 12:36:42 +02:00
Pete Matsyburka	38efcb99c0	fix verification	2025-01-31 21:32:15 +02:00
Pete Matsyburka	a92d914674	adjust form	2025-01-31 20:11:57 +02:00
Pete Matsyburka	219a698aa5	adjust i18n	2025-01-31 15:26:53 +02:00
Alex Turchyn	5bed6448dc	make custom fields titles smaller on mobile devices	2025-01-31 15:19:04 +02:00
Alex Turchyn	6d2a8ca3d3	update translations	2025-01-31 14:43:06 +02:00
Alex Turchyn	bfb2e0043d	update email attribution footer for Test Mode	2025-01-31 14:43:06 +02:00
Pete Matsyburka	922101b12c	fix dashboard toggle	2025-01-31 12:03:52 +02:00
Pete Matsyburka	9ff41a0c4a	scroll on mobile field click	2025-01-29 16:08:09 +02:00
Pete Matsyburka	071f187605	fix template conditions	2025-01-29 00:56:14 +02:00
Pete Matsyburka	ab6cd0e89c	adjust send email job	2025-01-28 18:52:12 +02:00
Pete Matsyburka	97c0dad7ff	add with fields search	2025-01-28 14:13:06 +02:00
Pete Matsyburka	bc0917a190	fix sign in date	2025-01-28 11:16:24 +02:00
Alex Turchyn	5718acecff	add translations	2025-01-28 11:15:33 +02:00
Alex Turchyn	395d43dbeb	Merge from docusealco/wip	2025-01-27 13:21:32 +02:00
Pete Matsyburka	37de5e0d0d	add resubmit from dashboard	2025-01-25 20:22:48 +02:00
Pete Matsyburka	44e848a1f0	fix heading move	2025-01-25 00:07:20 +02:00
Pete Matsyburka	f6d59d731c	fix email typo	2025-01-24 13:32:12 +02:00
Pete Matsyburka	87b039e709	fix submitter names	2025-01-23 22:21:01 +02:00
Pete Matsyburka	e0c6a4e08b	fix submission preview page	2025-01-23 17:11:50 +02:00
Pete Matsyburka	80b06550c2	adjust template link	2025-01-23 11:39:43 +02:00
Pete Matsyburka	ec8e35ed7a	fix email typo	2025-01-22 23:22:34 +02:00
Alex Turchyn	4dc325a6bb	change open/read timeout for webhook requests	2025-01-22 20:58:47 +02:00
Pete Matsyburka	d52c57df72	adjust i18n	2025-01-22 11:49:04 +02:00
Alex Turchyn	0cb2557447	add warning message to navbar	2025-01-21 13:10:27 +02:00
Pete Matsyburka	cd05c1fd19	search field by title	2025-01-20 23:08:19 +02:00
Pete Matsyburka	5458e82b6e	increase parties limit	2025-01-20 21:01:13 +02:00
Pete Matsyburka	c59c58624b	convert icon to png	2025-01-20 14:46:43 +02:00