add more icons

README.md

@@ -81,9 +81,9 @@ HOST=your-domain-name.com docker-compose up
 
 At DocuSeal we have expertise and technologies to make documents creation, filling, signing and processing seamlessly integrated with your product. We specialize in working with various industries, including **Banking, Healthcare, Transport, Real Estate, eCommerce, KYC, CRM, and other software products** that require bulk document signing. By leveraging DocuSeal, we can assist in reducing the overall cost of developing and processing electronic documents while ensuring security and compliance with local electronic document laws.
 
-[![Book an Integration Demo](https://cal.com/book-with-cal-dark.svg)](https://cal.com/docuseal)
+[Book a Meeting](https://calendly.com/kriti-docuseal/30min)
 
 ## License
 
 Distributed under the AGPLv3 License. See [LICENSE](https://github.com/docusealco/docuseal/blob/master/LICENSE) for more information.
-Unless otherwise noted, all files © 2023 Oleksandr Turchyn.
+Unless otherwise noted, all files © 2023 DocuSeal LLC.

app/controllers/submit_form_controller.rb

@@ -18,6 +18,8 @@ class SubmitFormController < ApplicationController
     Submitters::MaybeUpdateDefaultValues.call(@submitter, current_user)
 
     cookies[:submitter_sid] = @submitter.signed_id
+
+    render @submitter.submission.template.deleted_at? ? :archived : :show
   end
 
   def update

app/controllers/users_controller.rb

@@ -27,7 +27,10 @@ class UsersController < ApplicationController
   def update
     return redirect_to settings_users_path, notice: 'Unable to update user.' if Docuseal.demo?
 
-    if @user.update(user_params.compact_blank.except(current_user == @user ? :role : nil))
+    attrs = user_params.compact_blank
+    attrs.delete(:role) if User::ROLES.exclude?(attrs[:role])
+
+    if @user.update(attrs.except(current_user == @user ? :role : nil))
       redirect_to settings_users_path, notice: 'User has been updated'
     else
       render turbo_stream: turbo_stream.replace(:modal, template: 'users/edit'), status: :unprocessable_entity

app/javascript/application.js

@@ -76,12 +76,12 @@ document.addEventListener('turbo:submit-end', async (event) => {
 window.customElements.define('template-builder', class extends HTMLElement {
   connectedCallback () {
     this.appElem = document.createElement('div')
-    this.appElem.classList.add('max-h-screen')
 
     this.app = createApp(TemplateBuilder, {
       template: reactive(JSON.parse(this.dataset.template)),
       backgroundColor: '#faf7f5',
       withPhone: this.dataset.withPhone === 'true',
+      withLogo: this.dataset.withLogo !== 'false',
       acceptFileTypes: this.dataset.acceptFileTypes,
       isDirectUpload: this.dataset.isDirectUpload === 'true'
     })

app/javascript/submission_form/completed.vue

@@ -11,6 +11,15 @@
       </span>
     </p>
     <div class="space-y-3 mt-5">
+      <a
+        v-if="completedButton.url"
+        :href="completedButton.url"
+        class="white-button flex items-center w-full"
+      >
+        <span>
+          {{ completedButton.title || 'Back to Website' }}
+        </span>
+      </a>
       <button
         v-if="canSendEmail && !isDemo"
         class="white-button !h-auto flex items-center space-x-1 w-full"
@@ -52,15 +61,6 @@
           Star on Github
         </span>
       </a>
-      <a
-        v-if="completedButton.url"
-        :href="completedButton.url"
-        class="white-button flex items-center space-x-1 w-full"
-      >
-        <span>
-          {{ completedButton.title || 'Back to Website' }}
-        </span>
-      </a>
       <a
         v-if="isDemo"
         href="https://docuseal.co/sign_up"

app/javascript/submission_form/form.vue

@@ -224,6 +224,9 @@
                       :id="field.uuid"
                       type="checkbox"
                       class="base-checkbox !h-7 !w-7"
+                      :oninvalid="`this.setCustomValidity('${t('please_check_the_box_to_continue')}')`"
+                      :onchange="`this.setCustomValidity(validity.valueMissing ? '${t('please_check_the_box_to_continue')}' : '');`"
+                      :required="field.required"
                       :checked="!!values[field.uuid]"
                       @click="[$refs.areas.scrollIntoField(field), values[field.uuid] = !values[field.uuid]]"
                     >
@@ -416,6 +419,11 @@ export default {
       required: false,
       default: false
     },
+    allowToSkip: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     goToLast: {
       type: Boolean,
       required: false,
@@ -631,7 +639,7 @@ export default {
 
       stepPromise().then(async () => {
         const emptyRequiredField = this.stepFields.find((fields, index) => {
-          return index < this.currentStep && fields[0].required && fields[0].type === 'phone' && !this.submittedValues[fields[0].uuid]
+          return index < this.currentStep && fields[0].required && (fields[0].type === 'phone' || !this.allowToSkip) && !this.submittedValues[fields[0].uuid]
         })
 
         const formData = new FormData(this.$refs.form)

app/javascript/submission_form/i18n.js

@@ -20,6 +20,7 @@ const en = {
   form_has_been_completed: 'Form has been completed!',
   create_a_free_account: 'Create a Free Account',
   signed_with: 'Signed with',
+  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',
   use_international_format: 'Use internatioanl format: +1xxx',
@@ -53,6 +54,7 @@ const es = {
   form_has_been_completed: '¡El formulario ha sido completado!',
   create_a_free_account: 'Crear una Cuenta Gratuita',
   signed_with: 'Firmado con',
+  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',
   use_international_format: 'Usar formato internacional: +1xxx',
@@ -86,6 +88,7 @@ const it = {
   form_has_been_completed: 'Il modulo è stato completato!',
   create_a_free_account: 'Crea un Account Gratuito',
   signed_with: 'Firmato con',
+  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',
   use_international_format: 'Usa formato internazionale: +1xxx',
@@ -119,6 +122,7 @@ const de = {
   form_has_been_completed: 'Formular wurde ausgefüllt!',
   create_a_free_account: 'Kostenloses Konto erstellen',
   signed_with: 'Unterschrieben mit',
+  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',
   use_international_format: 'Internationales Format verwenden: +1xxx',
@@ -152,6 +156,7 @@ const fr = {
   form_has_been_completed: 'Le formulaire a été complété !',
   create_a_free_account: 'Créer un Compte Gratuit',
   signed_with: 'Signé avec',
+  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',
   use_international_format: 'Utiliser le format international : +1xxx',
@@ -185,6 +190,7 @@ const pl = {
   form_has_been_completed: 'Formularz został wypełniony!',
   create_a_free_account: 'Utwórz darmowe konto',
   signed_with: 'Podpisane za pomocą',
+  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',
   use_international_format: 'Użyj międzynarodowego formatu: +1xxx',
@@ -218,6 +224,7 @@ const uk = {
   form_has_been_completed: 'Форму заповнено!',
   create_a_free_account: 'Створити безкоштовний обліковий запис',
   signed_with: 'Підписано за допомогою',
+  please_check_the_box_to_continue: 'Будь ласка, позначте прапорець, щоб продовжити',
   open_source_documents_software: 'відкритий програмний засіб для документів',
   verified_phone_number: 'Підтвердіть номер телефону',
   use_international_format: 'Використовуйте міжнародний формат: +1xxx',
@@ -251,6 +258,7 @@ const cs = {
   form_has_been_completed: 'Formulář byl dokončen!',
   create_a_free_account: 'Vytvořit bezplatný účet',
   signed_with: 'Podepsáno pomocí',
+  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',
   use_international_format: 'Použijte mezinárodní formát: +1xxx',
@@ -284,6 +292,7 @@ const pt = {
   form_has_been_completed: 'O formulário foi concluído!',
   create_a_free_account: 'Criar uma Conta Gratuita',
   signed_with: 'Assinado com',
+  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',
   use_international_format: 'Use formato internacional: +1xxx',

app/javascript/submission_form/multi_select_step.vue

@@ -21,7 +21,7 @@
             :name="`values[${field.uuid}][]`"
             :value="option"
             class="base-checkbox !h-7 !w-7"
-            :checked="modelValue.includes(option)"
+            :checked="(modelValue || []).includes(option)"
             @change="onChange"
           >
           <span class="text-xl">

app/javascript/template_builder/area.vue

@@ -4,6 +4,7 @@
     :style="positionStyle"
     @pointerdown.stop
     @mousedown.stop="startDrag"
+    @touchstart="startTouchDrag"
   >
     <div
       v-if="isSelected || isDraw"
@@ -32,7 +33,7 @@
     <div
       v-if="field?.type"
       class="absolute bg-white rounded-t border overflow-visible whitespace-nowrap group-hover:flex group-hover:z-10"
-      :class="{ 'flex z-10': isNameFocus || isSelected, hidden: !isNameFocus && !isSelected }"
+      :class="{ 'flex z-10': isNameFocus || isSelected, invisible: !isNameFocus && !isSelected }"
       style="top: -25px; height: 25px"
       @mousedown.stop
       @pointerdown.stop
@@ -108,12 +109,14 @@
       </span>
     </div>
     <div
+      ref="touchTarget"
       class="absolute top-0 bottom-0 right-0 left-0 cursor-pointer"
     />
     <span
       v-if="field?.type"
-      class="h-2.5 w-2.5 -right-1 rounded-full -bottom-1 border-gray-400 bg-white shadow-md border absolute cursor-nwse-resize"
+      class="h-4 w-4 md:h-2.5 md:w-2.5 -right-1 rounded-full -bottom-1 border-gray-400 bg-white shadow-md border absolute cursor-nwse-resize"
       @mousedown.stop="startResize"
+      @touchstart="startTouchResize"
     />
   </div>
 </template>
@@ -186,7 +189,12 @@ export default {
         'border-sky-500',
         'border-emerald-500',
         'border-yellow-300',
-        'border-purple-600'
+        'border-purple-600',
+        'border-pink-500',
+        'border-cyan-500',
+        'border-orange-500',
+        'border-lime-500',
+        'border-indigo-500'
       ]
     },
     bgColors () {
@@ -195,7 +203,12 @@ export default {
         'bg-sky-100',
         'bg-emerald-100',
         'bg-yellow-100',
-        'bg-purple-100'
+        'bg-purple-100',
+        'bg-pink-100',
+        'bg-cyan-100',
+        'bg-orange-100',
+        'bg-lime-100',
+        'bg-indigo-100'
       ]
     },
     isSelected () {
@@ -309,6 +322,47 @@ export default {
 
       this.$emit('start-drag')
     },
+    startTouchDrag (e) {
+      if (e.target !== this.$refs.touchTarget) {
+        return
+      }
+
+      this.$refs?.name?.blur()
+
+      e.preventDefault()
+
+      this.isDragged = true
+
+      const rect = e.target.getBoundingClientRect()
+
+      this.selectedAreaRef.value = this.area
+
+      this.dragFrom = { x: rect.left - e.touches[0].clientX, y: rect.top - e.touches[0].clientY }
+
+      this.$el.getRootNode().addEventListener('touchmove', this.touchDrag)
+      this.$el.getRootNode().addEventListener('touchend', this.stopTouchDrag)
+
+      this.$emit('start-drag')
+    },
+    touchDrag (e) {
+      const page = this.$parent.$refs.mask.previousSibling
+      const rect = page.getBoundingClientRect()
+
+      this.area.x = (this.dragFrom.x + e.touches[0].clientX - rect.left) / rect.width
+      this.area.y = (this.dragFrom.y + e.touches[0].clientY - rect.top) / rect.height
+    },
+    stopTouchDrag () {
+      this.$el.getRootNode().removeEventListener('touchmove', this.touchDrag)
+      this.$el.getRootNode().removeEventListener('touchend', this.stopTouchDrag)
+
+      if (this.isDragged) {
+        this.save()
+      }
+
+      this.isDragged = false
+
+      this.$emit('stop-drag')
+    },
     stopDrag () {
       this.$el.getRootNode().removeEventListener('mousemove', this.drag)
       this.$el.getRootNode().removeEventListener('mouseup', this.stopDrag)
@@ -335,6 +389,33 @@ export default {
 
       this.$emit('stop-resize')
 
+      this.save()
+    },
+    startTouchResize (e) {
+      this.selectedAreaRef.value = this.area
+
+      this.$refs?.name?.blur()
+
+      e.preventDefault()
+
+      this.$el.getRootNode().addEventListener('touchmove', this.touchResize)
+      this.$el.getRootNode().addEventListener('touchend', this.stopTouchResize)
+
+      this.$emit('start-resize', 'nwse')
+    },
+    touchResize (e) {
+      const page = this.$parent.$refs.mask.previousSibling
+      const rect = page.getBoundingClientRect()
+
+      this.area.w = (e.touches[0].clientX - rect.left) / rect.width - this.area.x
+      this.area.h = (e.touches[0].clientY - rect.top) / rect.height - this.area.y
+    },
+    stopTouchResize () {
+      this.$el.getRootNode().removeEventListener('touchmove', this.touchResize)
+      this.$el.getRootNode().removeEventListener('touchend', this.stopTouchResize)
+
+      this.$emit('stop-resize')
+
       this.save()
     }
   }

app/javascript/template_builder/builder.vue

@@ -1,9 +1,12 @@
 <template>
   <div
     style="max-width: 1600px"
-    class="mx-auto pl-4 h-full"
+    class="mx-auto pl-3 md:pl-4 h-full"
   >
-    <div class="flex justify-between py-1.5 items-center pr-4">
+    <div
+      class="flex justify-between py-1.5 items-center pr-4 sticky top-0 z-10"
+      :style="{ backgroundColor }"
+    >
       <div class="flex space-x-3">
         <a
           v-if="withLogo"
@@ -59,10 +62,7 @@
         </template>
       </div>
     </div>
-    <div
+    <div class="flex md:max-h-[calc(100vh-60px)]">
-      class="flex"
-      style="max-height: calc(100% - 60px)"
-    >
       <div
         ref="previews"
         :style="{ 'display': isBreakpointLg ? 'none' : 'initial' }"
@@ -97,7 +97,7 @@
           />
         </div>
       </div>
-      <div class="w-full overflow-y-auto overflow-x-hidden mt-0.5 pt-0.5">
+      <div class="w-full overflow-y-hidden md:overflow-y-auto overflow-x-hidden mt-0.5 pt-0.5">
         <div
           ref="documents"
           class="pr-3.5 pl-0.5"
@@ -152,17 +152,54 @@
             </div>
           </template>
         </div>
-        <div
+        <span
-          v-if="sortedDocuments.length"
+          v-if="drawField"
-          class="sticky md:hidden"
+          class="fixed text-center w-full left-1/2 bottom-0 transform -translate-x-1/2"
-          style="bottom: 100px"
         >
-          <div class="px-4 py-3 rounded-2xl bg-base-200 flex items-center justify-between ml-4 mr-6">
+          <span
-            <span class="w-full text-center text-lg">
+            class="rounded bg-base-200 px-4 py-2 rounded-full inline-flex space-x-2 mx-auto items-center mb-4 z-20 md:hidden"
-              You need a larger screen to use builder tools.
+          >
+            <component
+              :is="fieldIcons[drawField.type]"
+              :width="20"
+              :height="20"
+              class="inline"
+              :stroke-width="1.6"
+            />
+            <span>
+              Draw {{ fieldNames[drawField.type] }} Field
             </span>
-          </div>
+            <a
-        </div>
+              href="#"
+              class="link block text-center"
+              @click.prevent="drawField = null"
+            >
+              Cancel
+            </a>
+          </span>
+        </span>
+        <FieldType
+          v-if="sortedDocuments.length && !drawField"
+          class="dropdown-top dropdown-end fixed bottom-4 right-4 z-10 md:hidden"
+          :model-value="''"
+          @update:model-value="startFieldDraw($event)"
+        >
+          <label
+            class="btn btn-neutral text-white btn-circle btn-lg group"
+            tabindex="0"
+          >
+            <IconPlus
+              class="group-focus:hidden"
+              width="28"
+              height="28"
+            />
+            <IconX
+              class="hidden group-focus:inline"
+              width="28"
+              height="28"
+            />
+          </label>
+        </FieldType>
       </div>
       <div
         class="relative w-80 flex-none mt-1 pr-4 pl-0.5 hidden md:block"
@@ -214,7 +251,8 @@ import Logo from './logo'
 import Contenteditable from './contenteditable'
 import DocumentPreview from './preview'
 import DocumentControls from './controls'
-import { IconUsersPlus, IconDeviceFloppy, IconInnerShadowTop } from '@tabler/icons-vue'
+import FieldType from './field_type'
+import { IconUsersPlus, IconDeviceFloppy, IconInnerShadowTop, IconPlus, IconX } from '@tabler/icons-vue'
 import { v4 } from 'uuid'
 import { ref, computed } from 'vue'
 
@@ -224,6 +262,9 @@ export default {
     Upload,
     Document,
     Fields,
+    IconPlus,
+    FieldType,
+    IconX,
     Logo,
     Dropzone,
     DocumentPreview,
@@ -300,6 +341,8 @@ export default {
     }
   },
   computed: {
+    fieldIcons: FieldType.computed.fieldIcons,
+    fieldNames: FieldType.computed.fieldNames,
     selectedAreaRef: () => ref(),
     fieldAreasIndex () {
       const areas = {}
@@ -351,6 +394,22 @@ export default {
     this.documentRefs = []
   },
   methods: {
+    startFieldDraw (type) {
+      const field = {
+        name: '',
+        uuid: v4(),
+        required: type !== 'checkbox',
+        areas: [],
+        submitter_uuid: this.selectedSubmitter.uuid,
+        type
+      }
+
+      if (['select', 'multiple', 'radio'].includes(type)) {
+        field.options = ['']
+      }
+
+      this.drawField = field
+    },
     undo () {
       if (this.undoStack.length > 1) {
         this.undoStack.pop()
@@ -448,6 +507,10 @@ export default {
         this.drawField.areas ||= []
         this.drawField.areas.push(area)
 
+        if (this.template.fields.indexOf(this.drawField) === -1) {
+          this.template.fields.push(this.drawField)
+        }
+
         this.drawField = null
 
         this.selectedAreaRef.value = area

app/javascript/template_builder/field.vue

@@ -31,21 +31,19 @@
           v-if="isNameFocus"
           class="flex items-center relative"
         >
-          <template v-if="field.type !== 'checkbox'">
+          <input
-            <input
+            :id="`required-checkbox-${field.uuid}`"
-              :id="`required-checkbox-${field.uuid}`"
+            v-model="field.required"
-              v-model="field.required"
+            type="checkbox"
-              type="checkbox"
+            class="checkbox checkbox-xs no-animation rounded"
-              class="checkbox checkbox-xs no-animation rounded"
+            @mousedown.prevent
-              @mousedown.prevent
+          >
-            >
+          <label
-            <label
+            :for="`required-checkbox-${field.uuid}`"
-              :for="`required-checkbox-${field.uuid}`"
+            class="label text-xs"
-              class="label text-xs"
+            @click.prevent="field.required = !field.required"
-              @click.prevent="field.required = !field.required"
+            @mousedown.prevent
-              @mousedown.prevent
+          >Required</label>
-            >Required</label>
-          </template>
         </div>
         <div
           v-else

app/javascript/template_builder/field_submitter.vue

@@ -70,7 +70,7 @@
           </button>
         </a>
       </li>
-      <li v-if="submitters.length < 5">
+      <li v-if="submitters.length < 10">
         <a
           href="#"
           class="flex px-2"
@@ -130,7 +130,12 @@ export default {
         'bg-sky-500',
         'bg-emerald-500',
         'bg-yellow-300',
-        'bg-purple-600'
+        'bg-purple-600',
+        'bg-pink-500',
+        'bg-cyan-500',
+        'bg-orange-500',
+        'bg-lime-500',
+        'bg-indigo-500'
       ]
     },
     names () {
@@ -139,7 +144,12 @@ export default {
         'Second Submitter',
         'Third Submitter',
         'Fourth Submitter',
-        'Fifth Submitter'
+        'Fifth Submitter',
+        'Sixth Submitter',
+        'Seventh Submitter',
+        'Eighth Submitter',
+        'Ninth Submitter',
+        'Tenth Submitter'
       ]
     },
     selectedSubmitter () {

app/javascript/template_builder/field_type.vue

@@ -1,20 +1,22 @@
 <template>
   <span class="dropdown">
-    <label
+    <slot>
-      tabindex="0"
+      <label
-      :title="fieldNames[modelValue]"
+        tabindex="0"
-      class="cursor-pointer"
+        :title="fieldNames[modelValue]"
-    >
+        class="cursor-pointer"
-      <component
+      >
-        :is="fieldIcons[modelValue]"
+        <component
-        :width="buttonWidth"
+          :is="fieldIcons[modelValue]"
-        :class="buttonClasses"
+          :width="buttonWidth"
-        :stroke-width="1.6"
+          :class="buttonClasses"
-      />
+          :stroke-width="1.6"
-    </label>
+        />
+      </label>
+    </slot>
     <ul
       tabindex="0"
-      class="dropdown-content menu menu-xs p-2 shadow rounded-box w-52 z-10"
+      class="dropdown-content menu menu-xs p-2 shadow rounded-box w-52 z-10 mb-3"
       :class="menuClasses"
       @click="closeDropdown"
     >

app/javascript/template_builder/fields.vue

@@ -107,9 +107,6 @@
       <li>
         Draw a text field on the page with a mouse
       </li>
-      <li>
-        Single click on the page to add a checkbox
-      </li>
       <li>
         Drag &amp; drop any other field type on the page
       </li>

app/javascript/template_builder/page.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="relative cursor-crosshair select-none">
+  <div
+    class="relative cursor-crosshair select-none"
+    :style="drawField ? 'touch-action: none' : ''"
+  >
     <img
       ref="image"
       :src="image.url"
@@ -32,12 +35,13 @@
       />
     </div>
     <div
-      v-show="resizeDirection || isMove || isDrag || showMask"
+      v-show="resizeDirection || isMove || isDrag || showMask || (drawField && isMobile)"
       id="mask"
       ref="mask"
       class="top-0 bottom-0 left-0 right-0 absolute z-10"
       :class="{ 'cursor-grab': isDrag || isMove, 'cursor-nwse-resize': drawField, [resizeDirectionClasses[resizeDirection]]: !!resizeDirectionClasses }"
       @pointermove="onPointermove"
+      @pointerdown="onStartDraw"
       @dragover.prevent
       @drop="onDrop"
       @pointerup="onPointerup"
@@ -93,6 +97,9 @@ export default {
     }
   },
   computed: {
+    isMobile () {
+      return /android|iphone|ipad/i.test(navigator.userAgent)
+    },
     resizeDirectionClasses () {
       return {
         nwse: 'cursor-nwse-resize',
@@ -125,6 +132,10 @@ export default {
       })
     },
     onStartDraw (e) {
+      if (this.isMobile && !this.drawField) {
+        return
+      }
+
       this.showMask = true
 
       this.$nextTick(() => {

app/jobs/send_form_completed_webhook_request_job.rb

@@ -4,7 +4,7 @@ class SendFormCompletedWebhookRequestJob < ApplicationJob
   USER_AGENT = 'DocuSeal.co Webhook'
 
   def perform(submitter)
-    config = submitter.submission.account.encrypted_configs.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
+    config = Accounts.load_webhook_configs(submitter.submission.account)
 
     return if config.blank? || config.value.blank?
 
@@ -15,7 +15,7 @@ class SendFormCompletedWebhookRequestJob < ApplicationJob
     Faraday.post(config.value,
                  {
                    event_type: 'form.completed',
-                   timestamp: Time.current.iso8601,
+                   timestamp: Time.current,
                    data: Submitters::SerializeForWebhook.call(submitter)
                  }.to_json,
                  'Content-Type' => 'application/json',

app/jobs/send_form_started_webhook_request_job.rb

@@ -4,7 +4,7 @@ class SendFormStartedWebhookRequestJob < ApplicationJob
   USER_AGENT = 'DocuSeal.co Webhook'
 
   def perform(submitter)
-    config = submitter.submission.account.encrypted_configs.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
+    config = Accounts.load_webhook_configs(submitter.submission.account)
 
     return if config.blank? || config.value.blank?
 
@@ -13,7 +13,7 @@ class SendFormStartedWebhookRequestJob < ApplicationJob
     Faraday.post(config.value,
                  {
                    event_type: 'form.started',
-                   timestamp: Time.current.iso8601,
+                   timestamp: Time.current,
                    data: Submitters::SerializeForWebhook.call(submitter)
                  }.to_json,
                  'Content-Type' => 'application/json',

app/jobs/send_form_viewed_webhook_request_job.rb

@@ -4,7 +4,7 @@ class SendFormViewedWebhookRequestJob < ApplicationJob
   USER_AGENT = 'DocuSeal.co Webhook'
 
   def perform(submitter)
-    config = submitter.submission.account.encrypted_configs.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
+    config = Accounts.load_webhook_configs(submitter.submission.account)
 
     return if config.blank? || config.value.blank?
 
@@ -13,7 +13,7 @@ class SendFormViewedWebhookRequestJob < ApplicationJob
     Faraday.post(config.value,
                  {
                    event_type: 'form.viewed',
-                   timestamp: Time.current.iso8601,
+                   timestamp: Time.current,
                    data: Submitters::SerializeForWebhook.call(submitter)
                  }.to_json,
                  'Content-Type' => 'application/json',

app/views/accounts/show.html.erb

@@ -21,8 +21,9 @@
           </div>
         </div>
       <% end %>
-      <% unless Docuseal.multitenant? %>
+      <% encrypted_config = @encrypted_config || EncryptedConfig.find_or_initialize_by(account: current_account, key: EncryptedConfig::APP_URL_KEY) %>
-        <%= f.fields_for @encrypted_config || EncryptedConfig.find_or_initialize_by(account: current_account, key: EncryptedConfig::APP_URL_KEY) do |ff| %>
+      <% if !Docuseal.multitenant? && can?(:manage, encrypted_config) %>
+        <%= f.fields_for encrypted_config do |ff| %>
           <div class="form-control">
             <%= ff.label :value, 'App URL', class: 'label' %>
             <%= ff.text_field :value, autocomplete: 'off', class: 'base-input' %>

app/views/icons/_building.html.erb

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+  <path d="M3 21l18 0"></path>
+  <path d="M9 8l1 0"></path>
+  <path d="M9 12l1 0"></path>
+  <path d="M9 16l1 0"></path>
+  <path d="M14 8l1 0"></path>
+  <path d="M14 12l1 0"></path>
+  <path d="M14 16l1 0"></path>
+  <path d="M5 21v-16a2 2 0 0 1 2 -2h10a2 2 0 0 1 2 2v16"></path>
+</svg>

app/views/icons/_forms.html.erb

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+  <path d="M12 3a3 3 0 0 0 -3 3v12a3 3 0 0 0 3 3"></path>
+  <path d="M6 3a3 3 0 0 1 3 3v12a3 3 0 0 1 -3 3"></path>
+  <path d="M13 7h7a1 1 0 0 1 1 1v8a1 1 0 0 1 -1 1h-7"></path>
+  <path d="M5 7h-1a1 1 0 0 0 -1 1v8a1 1 0 0 0 1 1h1"></path>
+  <path d="M17 12h.01"></path>
+  <path d="M13 12h.01"></path>
+</svg>

app/views/icons/_users.html.erb

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+  <path d="M9 7m-4 0a4 4 0 1 0 8 0a4 4 0 1 0 -8 0"></path>
+  <path d="M3 21v-2a4 4 0 0 1 4 -4h4a4 4 0 0 1 4 4v2"></path>
+  <path d="M16 3.13a4 4 0 0 1 0 7.75"></path>
+  <path d="M21 21v-2a4 4 0 0 0 -3 -3.85"></path>
+</svg>

app/views/layouts/_head_tags.html.erb

@@ -0,0 +1,4 @@
+<title>
+  DocuSeal | Open Source Document Filling and Signing
+</title>
+<%= render 'shared/meta' %>

app/views/layouts/application.html.erb

@@ -1,10 +1,7 @@
 <!DOCTYPE html>
 <html data-theme="docuseal" lang="en">
   <head>
-    <title>
+    <%= render 'layouts/head_tags' %>
-      DocuSeal | Open Source Document Filling and Signing
-    </title>
-    <%= render 'shared/meta' %>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>

app/views/layouts/form.html.erb

@@ -1,10 +1,7 @@
 <!DOCTYPE html>
 <html data-theme="docuseal" lang="en">
   <head>
-    <title>
+    <%= render 'layouts/head_tags' %>
-      DocuSeal | Open Source Document Filling and Signing
-    </title>
-    <%= render 'shared/meta' %>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>

app/views/layouts/plain.html.erb

@@ -1,10 +1,7 @@
 <!DOCTYPE html>
 <html data-theme="docuseal" lang="en">
   <head>
-    <title>
+    <%= render 'layouts/head_tags' %>
-      DocuSeal | Open Source Document Filling and Signing
-    </title>
-    <%= render 'shared/meta' %>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>

app/views/pages/landing.html.erb

@@ -22,7 +22,7 @@
             </div>
             <h3 class="mb-4 text-2xl font-semibold">Easy to Start</h3>
             <p class="text-base text-gray-500">
-              Run on your own host using <a href="https://hub.docker.com/r/docuseal/docuseal" class="link link-neutral font-bold" target="_blank">Docker</a> container, or deploy on  your favorite managed PaaS with a single <a href="https://www.docuseal.co/install" class="link link-neutral font-bold">click</a>.
+              Run on your own host using Docker container, or deploy on  your favorite managed PaaS with a single <a href="https://www.docuseal.co/install" class="link link-neutral font-bold">click</a>.
             </p>
           </div>
         </div>
@@ -70,4 +70,4 @@
     </div>
   </div>
 </section>
-<%= render 'shared/attribution' %>
+<%= render 'shared/attribution', with_counter: true %>

app/views/shared/_attribution.html.erb

@@ -1 +1 @@
-<%= render 'shared/powered_by' %>
+<%= render 'shared/powered_by', with_counter: local_assigns[:with_counter] %>

app/views/shared/_classes.html.erb

@@ -0,0 +1 @@
+<% 'stats stat stat-figure stat-title stat-value text-accent' %>

app/views/shared/_github.html.erb

@@ -0,0 +1,3 @@
+<a href="<%= Docuseal::GITHUB_URL %>" target="_blank" class="inline">
+  <img alt="GitHub Repo stars" src="https://www.docuseal.co/github-badge.svg" style="height: 22px">
+</a>

app/views/shared/_navbar.html.erb

@@ -1,14 +1,9 @@
 <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">
-      <%= render 'shared/logo' %>
+      <%= render 'shared/title' %>
-      <span>DocuSeal</span>
     </a>
-    <% unless Docuseal.demo? %>
+    <%= render 'shared/github' %>
-      <a href="<%= Docuseal::GITHUB_URL %>" target="_blank" class="inline">
-        <img alt="GitHub Repo stars" src="https://www.docuseal.co/github-badge.svg" style="height: 22px">
-      </a>
-    <% end %>
   </div>
   <% if signed_in? %>
     <div class="space-x-4 flex items-center">
@@ -16,11 +11,13 @@
         <%= render 'shared/github_button' %>
       <% else %>
         <div class="flex items-center justify-center space-x-4 mr-1">
-          <%= link_to Docuseal.multitenant? ? console_redirect_index_path : Docuseal::CONSOLE_URL, class: 'hidden md:inline-flex items-center font-medium text-lg', data: { prefetch: false } do %>
+          <% if can?(:manage, EncryptedConfig) && !can?(:manage, :tenants) %>
-            Console
+            <%= link_to Docuseal.multitenant? ? console_redirect_index_path : Docuseal::CONSOLE_URL, class: 'hidden md:inline-flex items-center font-medium text-lg', data: { prefetch: false } do %>
-            <span class="badge badge-warning ml-1">New</span>
+              Console
+              <span class="badge badge-warning ml-1">New</span>
+            <% end %>
+            <span class="hidden md:inline-flex h-3 border-r border-base-content"></span>
           <% end %>
-          <span class="hidden md:inline-flex h-3 border-r border-base-content"></span>
           <%= link_to 'Settings', settings_profile_index_path, class: 'hidden md:inline-flex font-medium text-lg' %>
         </div>
       <% end %>
@@ -35,7 +32,7 @@
               <span class="mr-1">Profile</span>
             <% end %>
           </li>
-          <% unless Docuseal.demo? %>
+          <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) %>
             <li>
               <%= link_to Docuseal.multitenant? ? console_redirect_index_path : Docuseal::CONSOLE_URL, data: { prefetch: false }, class: 'flex items-center' do %>
                 <%= svg_icon('terminal', class: 'w-5 h-5 stroke-2') %>
@@ -43,12 +40,14 @@
               <% end %>
             </li>
           <% end %>
-          <li>
+          <% if can?(:read, EncryptedConfig.new(key: EncryptedConfig::ESIGN_CERTS_KEY, account: current_account)) %>
-            <%= link_to settings_esign_path, class: 'flex items-center' do %>
+            <li>
-              <%= svg_icon('zoom_check', class: 'w-5 h-5 stroke-2') %>
+              <%= link_to settings_esign_path, class: 'flex items-center' do %>
-              <span class="mr-1">Verify PDF</span>
+                <%= svg_icon('zoom_check', class: 'w-5 h-5 stroke-2') %>
-            <% end %>
+                <span class="mr-1">Verify PDF</span>
-          </li>
+              <% end %>
+            </li>
+          <% end %>
           <li>
             <%= button_to destroy_user_session_path, method: :delete, data: { turbo: false }, class: 'flex items-center' do %>
               <%= svg_icon('logout', class: 'w-5 h-5 stroke-2 mr-2 inline') %>

app/views/shared/_powered_by.html.erb

@@ -1,4 +1,13 @@
 <div class="text-center px-2">
-  Powered by
+  <% if local_assigns[:with_counter] %>
+    <% count = Submitter.where.not(completed_at: nil).distinct.count(:submission_id) %>
+    <% if count > 1 %>
+      <b><%= count %></b> documents signed with
+    <% else %>
+      Powered by
+    <% end %>
+  <% else %>
+    Powered by
+  <% end %>
   <a href="<%= Docuseal::PRODUCT_URL %>" class="underline"><%= Docuseal::PRODUCT_NAME %></a> - open source documents software
 </div>

app/views/shared/_settings_nav.html.erb

@@ -58,7 +58,8 @@
           <%= link_to 'Personalization', settings_personalization_path, class: 'text-base hover:bg-base-300' %>
         </li>
       <% end %>
-      <% unless Docuseal.demo? %>
+      <%= render 'shared/settings_nav_extra' %>
+      <% if !Docuseal.demo? && can?(:manage, EncryptedConfig) %>
         <li>
           <%= link_to Docuseal.multitenant? ? console_redirect_index_path : Docuseal::CONSOLE_URL, class: 'text-base hover:bg-base-300', data: { prefetch: false } do %>
             Console
@@ -68,27 +69,31 @@
       <% end %>
     </ul>
   </menu-active>
-  <div class="mx-4 border-t border-base-300 hidden md:block">
+  <% if !can?(:manage, :tenants) %>
-    <div class="text-sm mt-3">
+    <div class="mx-4 border-t border-base-300 hidden md:block">
-      Need help? Ask a question:
+      <div class="text-sm mt-3">
-    </div>
+        Need help? Ask a question:
-    <div class="flex mt-3 space-x-3">
+      </div>
-      <a href="<%= Docuseal::GITHUB_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
+      <div class="flex mt-3 space-x-3">
-        <%= svg_icon('brand_github', class: 'w-8 h-8') %>
+        <div class="tooltip" data-tip="GitHub">
-      </a>
+          <a href="<%= Docuseal::GITHUB_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
-      <a href="<%= Docuseal::DISCORD_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
+            <%= svg_icon('brand_github', class: 'w-8 h-8') %>
-        <%= svg_icon('brand_discord', class: 'w-8 h-8') %>
+          </a>
-      </a>
+        </div>
-      <a href="<%= Docuseal::TWITTER_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
+        <div class="tooltip" data-tip="Discord Community">
-        <%= svg_icon('brand_twitter', class: 'w-8 h-8') %>
+          <a href="<%= Docuseal::DISCORD_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
+            <%= svg_icon('brand_discord', class: 'w-8 h-8') %>
+          </a>
+        </div>
+        <div class="tooltip" data-tip="Twitter">
+          <a href="<%= Docuseal::TWITTER_URL %>" target="_blank" class="btn btn-circle btn-primary btn-md">
+            <%= svg_icon('brand_twitter', class: 'w-8 h-8') %>
+          </a>
+        </div>
+      </div>
+      <a href="mailto:<%= Docuseal::SUPPORT_EMAIL %>" target="_blank" class="w-full block mt-4 underline text-center">
+        <%= Docuseal::SUPPORT_EMAIL %>
       </a>
     </div>
-    <a href="https://twitter.com/intent/tweet?<%= { text: "Open source DocuSign alternative\n#{Docuseal::GITHUB_URL} #{Docuseal::TWITTER_HANDLE}" }.to_query %>" target="_blank" class="btn btn-neutral btn-outline w-full mt-5">
+  <% end %>
-      <%= svg_icon('send', class: 'h-5 w-5') %>
-      Tell about us
-    </a>
-    <a href="mailto:<%= Docuseal::SUPPORT_EMAIL %>" target="_blank" class="w-full block mt-4 underline text-center">
-      <%= Docuseal::SUPPORT_EMAIL %>
-    </a>
-  </div>
 </div>

app/views/shared/_title.html.erb

@@ -0,0 +1,2 @@
+<%= render 'shared/logo' %>
+<span>DocuSeal</span>

app/views/start_form/show.html.erb

@@ -3,7 +3,9 @@
     <div class="space-y-6">
       <div class="text-center w-full space-y-6">
         <%= render 'banner' %>
-        <p class="text-xl font-semibold text-center">You have been invited to submit a form</p>
+        <% unless @template.deleted_at? %>
+          <p class="text-xl font-semibold text-center">You have been invited to submit a form</p>
+        <% end %>
       </div>
       <div class="flex items-center bg-base-200 rounded-xl p-4 mb-4">
         <div class="flex items-center">
@@ -12,19 +14,25 @@
           </div>
           <div>
             <p class="text-lg font-bold mb-1"><%= @template.name %></p>
-            <p class="text-sm">Invited by <span class="font-semibold"><%= @template.account.name %></span></p>
+            <% if @template.deleted_at? %>
+              <p class="text-sm">Form has been deleted by <span class="font-semibold"><%= @template.account.name %></span>.</p>
+            <% else %>
+              <p class="text-sm">Invited by <span class="font-semibold"><%= @template.account.name %></span></p>
+            <% end %>
           </div>
         </div>
       </div>
     </div>
-    <%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %>
+    <% unless @template.deleted_at? %>
-      <div class="form-control !mt-0">
+      <%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %>
-        <%= f.label :email, class: 'label' %>
+        <div class="form-control !mt-0">
-        <%= f.email_field :email, value: current_user&.email, required: true, class: 'base-input', placeholder: 'Provide your email to start' %>
+          <%= f.label :email, class: 'label' %>
-      </div>
+          <%= f.email_field :email, value: current_user&.email, required: true, class: 'base-input', placeholder: 'Provide your email to start' %>
-      <div class="form-control">
+        </div>
-        <%= f.button button_title(title: 'Start', disabled_with: 'Starting'), class: 'base-button' %>
+        <div class="form-control">
-      </div>
+          <%= f.button button_title(title: 'Start', disabled_with: 'Starting'), class: 'base-button' %>
+        </div>
+      <% end %>
     <% end %>
   </div>
 </div>

app/views/submissions/show.html.erb

@@ -66,7 +66,7 @@
       </div>
     </div>
     <div class="hidden md:block relative w-80 flex-none pt-0.5 pr-4 pl-0.5 overflow-auto space">
-      <% colors = %w[bg-red-500 bg-sky-500 bg-emerald-500 bg-yellow-300 bg-purple-600] %>
+      <% colors = %w[bg-red-500 bg-sky-500 bg-emerald-500 bg-yellow-300 bg-purple-600 bg-pink-500 bg-cyan-500 bg-orange-500 bg-lime-500 bg-indigo-500] %>
       <% submitter_fields_index = (@submission.template_fields || @submission.template.fields).group_by { |f| f['submitter_uuid'] } %>
       <% (@submission.template_submitters || @submission.template.submitters).each_with_index do |item, index| %>
         <% submitter = @submission.submitters.find { |e| e.uuid == item['uuid'] } %>

app/views/submit_form/archived.html.erb

@@ -0,0 +1,21 @@
+<div class="max-w-md mx-auto px-2 mt-12 mb-4">
+  <div class="space-y-6 mx-auto">
+    <div class="space-y-6">
+      <div class="flex items-center justify-center">
+        <%= render 'start_form/banner' %>
+      </div>
+      <div class="flex items-center bg-base-200 rounded-xl p-4 mb-4">
+        <div class="flex items-center">
+          <div class="mr-3">
+            <%= svg_icon('writing_sign', class: 'w-10 h-10') %>
+          </div>
+          <div>
+            <p class="text-lg font-bold mb-1"><%= @submitter.submission.template.name %></p>
+            <p class="text-sm">Form has been deleted by <span class="font-semibold"><%= @submitter.submission.template.account.name %></span>.</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<%= render 'shared/attribution' %>

app/views/templates/_submission.html.erb

@@ -39,7 +39,7 @@
       <% end %>
       <span class="btn btn-outline btn-sm w-20 md:w-24">View</span>
       <% if !submission.deleted_at? && can?(:destroy, submission) %>
-        <%= button_to button_title(title: nil, disabled_with: 'Remov', icon: svg_icon('trash', class: 'w-6 h-6')), submission_path(submission), class: 'btn btn-outline btn-sm', title: 'Delete', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
+        <%= button_to button_title(title: nil, disabled_with: 'Remov', icon: svg_icon('trash', class: 'w-6 h-6')), submission_path(submission), class: 'btn btn-outline btn-sm', form: { class: 'flex' }, title: 'Delete', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
       <% end %>
     </div>
   <% else %>
@@ -113,7 +113,7 @@
       <% end %>
       <span class="btn btn-outline btn-sm w-20 md:w-24">View</span>
       <% unless submission.deleted_at? %>
-        <%= button_to button_title(title: nil, disabled_with: 'Remov', icon: svg_icon('trash', class: 'w-6 h-6')), submission_path(submission), class: 'btn btn-outline btn-sm', title: 'Delete', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
+        <%= button_to button_title(title: nil, disabled_with: 'Remov', icon: svg_icon('trash', class: 'w-6 h-6')), submission_path(submission), class: 'btn btn-outline btn-sm', form: { class: 'flex' }, title: 'Delete', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
       <% end %>
     </div>
   <% end %>

db/migrate/20231007052818_update_checkboxes_required.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class UpdateCheckboxesRequired < ActiveRecord::Migration[7.0]
+  class MigrationTemplate < ApplicationRecord
+    self.table_name = 'templates'
+  end
+
+  def up
+    MigrationTemplate.find_each do |template|
+      fields = JSON.parse(template.fields)
+
+      fields.each do |field|
+        field['required'] = false if field['type'] == 'checkbox'
+      end
+
+      template.update_columns(fields: fields.to_json) if JSON.parse(template.fields) != fields
+    end
+  end
+
+  def down
+    nil
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_09_22_072041) do
+ActiveRecord::Schema[7.0].define(version: 2023_10_07_052818) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 

lib/accounts.rb

@@ -43,12 +43,19 @@ module Accounts
     new_template
   end
 
+  def load_webhook_configs(account)
+    account = Account.order(:id).first unless Docuseal.multitenant?
+
+    account.encrypted_configs.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
+  end
+
   def load_signing_pkcs(account)
     cert_data =
       if Docuseal.multitenant?
-        Docuseal::CERTS
+        EncryptedConfig.find_by(account:, key: EncryptedConfig::ESIGN_CERTS_KEY)&.value || Docuseal::CERTS
       else
-        EncryptedConfig.find_by(account:, key: EncryptedConfig::ESIGN_CERTS_KEY).value
+        EncryptedConfig.find_by(account: Account.order(:id).first,
+                                key: EncryptedConfig::ESIGN_CERTS_KEY).value
       end
 
     if (default_cert = cert_data['custom']&.find { |e| e['status'] == 'default' })

lib/replace_email_variables.rb

@@ -33,7 +33,7 @@ module ReplaceEmailVariables
   end
 
   def build_documents_links_text(submitter)
-    submitter.documents.map do |document|
+    Submitters.select_attachments_for_download(submitter).map do |document|
       link =
         Rails.application.routes.url_helpers.rails_blob_url(
           document, **Docuseal.default_url_options

lib/submissions/generate_audit_trail.rb

@@ -92,7 +92,7 @@ module Submissions
       documents_data = Submitters.select_attachments_for_download(last_submitter).map do |document|
         original_documents = submission.template.documents.select { |e| e.uuid == document.uuid }.presence
         original_documents ||= submission.template.documents.select do |e|
-          e.image? && submission.schema.any? do |item|
+          e.image? && submission.template_schema.any? do |item|
             item['attachment_uuid'] == e.uuid
           end
         end