remove i18n duplicate keys

app/controllers/accounts_controller.rb

@@ -37,6 +37,18 @@ class AccountsController < ApplicationController
     render :show, status: :unprocessable_entity
   end
 
+  def destroy
+    authorize!(:manage, current_account)
+
+    true_user.update!(locked_at: Time.current)
+
+    render turbo_stream: turbo_stream.replace(
+      :account_delete_button,
+      html: helpers.tag.p('Your account removal request will be processed within 2 weeks. ' \
+                          'Please contact us if you want to keep your account.')
+    )
+  end
+
   private
 
   def load_account

app/controllers/api/submissions_controller.rb

@@ -63,7 +63,7 @@ module Api
     end
 
     def create
-      Params::SubmissionCreateValidator.call(params, dry_run: true)
+      Params::SubmissionCreateValidator.call(params, dry_run: !Docuseal.multitenant?)
 
       return render json: { error: 'Template not found' }, status: :unprocessable_entity if @template.nil?
 
@@ -96,7 +96,8 @@ module Api
     def create_submissions(template, params)
       is_send_email = !params[:send_email].in?(['false', false])
 
-      if (emails = (params[:emails] || params[:email]).presence) && params[:submission].blank?
+      if (emails = (params[:emails] || params[:email]).presence) &&
+         (params[:submission].blank? && params[:submitters].blank?)
         Submissions.create_from_emails(template:,
                                        user: current_user,
                                        source: :api,
@@ -140,20 +141,27 @@ module Api
     end
 
     def submissions_params
-      key = params.key?(:submission) ? :submission : :submissions
+      permitted_attrs = [
+        :send_email, :send_sms, :bcc_completed, :completed_redirect_url,
+        {
+          message: %i[subject body],
+          submitters: [[:send_email, :send_sms, :completed_redirect_url, :uuid, :name, :email, :role,
+                        :completed, :phone, :application_key,
+                        { values: {}, readonly_fields: [], message: %i[subject body],
+                          fields: [%i[name default_value title description
+                                      readonly validation_pattern invalid_message]] }]]
+        }
+      ]
 
-      params.permit(
+      if params.key?(:submitters)
-        key => [
+        params.permit(*permitted_attrs)
-          [:send_email, :send_sms, :bcc_completed, :completed_redirect_url, {
+      else
-            message: %i[subject body],
+        key = params.key?(:submission) ? :submission : :submissions
-            submitters: [[:send_email, :send_sms, :completed_redirect_url, :uuid, :name, :email, :role,
+
-                          :completed, :phone, :application_key,
+        params.permit(
-                          { values: {}, readonly_fields: [], message: %i[subject body],
+          key => [permitted_attrs]
-                            fields: [%i[name default_value title description
+        ).fetch(key, [])
-                                        readonly validation_pattern invalid_message]] }]]
+      end
-          }]
-        ]
-      ).fetch(key, [])
     end
   end
 end

app/controllers/api/submitters_controller.rb

@@ -44,7 +44,7 @@ module Api
 
       Submissions::CreateFromSubmitters.maybe_set_template_fields(@submitter.submission,
                                                                   [normalized_params],
-                                                                  submitter_uuid: @submitter.uuid)
+                                                                  default_submitter_uuid: @submitter.uuid)
 
       assign_submitter_attrs(@submitter, normalized_params)
 

app/javascript/application.js

@@ -89,6 +89,7 @@ window.customElements.define('template-builder', class extends HTMLElement {
       withPhone: this.dataset.withPhone === 'true',
       withLogo: this.dataset.withLogo !== 'false',
       withPayment: this.dataset.withPayment === 'true',
+      currencies: (this.dataset.currencies || '').split(',').filter(Boolean),
       acceptFileTypes: this.dataset.acceptFileTypes,
       isDirectUpload: this.dataset.isDirectUpload === 'true'
     })

app/javascript/form.js

@@ -15,7 +15,7 @@ window.customElements.define('submission-form', class extends HTMLElement {
       goToLast: this.dataset.goToLast === 'true',
       isDemo: this.dataset.isDemo === 'true',
       attribution: this.dataset.attribution !== 'false',
-      withConfetti: true,
+      withConfetti: this.dataset.withConfetti !== 'false',
       withTypedSignature: this.dataset.withTypedSignature !== 'false',
       values: reactive(JSON.parse(this.dataset.values)),
       completedButton: JSON.parse(this.dataset.completedButton),

app/javascript/submission_form/area.vue

@@ -1,9 +1,9 @@
 <template>
   <div
-    class="flex absolute lg:text-base"
+    class="flex absolute lg:text-base -outline-offset-1"
     dir="auto"
     :style="computedStyle"
-    :class="{ 'text-[1.5vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars, 'cursor-default': !submittable, 'bg-red-100 border cursor-pointer ': submittable, 'border-red-100': !isActive && submittable, 'bg-opacity-80': !isActive && !isValueSet && submittable, 'border-red-500 border-dashed border-2 z-10': isActive && submittable, 'bg-opacity-40': (isActive || isValueSet) && submittable }"
+    :class="{ 'text-[1.5vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars, 'cursor-default': !submittable, 'border border-red-100 bg-red-100 cursor-pointer': submittable, 'border border-red-100': !isActive && submittable, 'bg-opacity-80': !isActive && !isValueSet && submittable, 'outline-red-500 outline-dashed outline-2 z-10': isActive && submittable, 'bg-opacity-40': (isActive || isValueSet) && submittable }"
   >
     <div
       v-if="!isActive && !isValueSet && field.type !== 'checkbox' && submittable && !area.option_uuid"
@@ -81,7 +81,8 @@
     </div>
     <div
       v-else-if="field.type === 'checkbox'"
-      class="w-full p-[0.2vw] flex items-center justify-center"
+      class="w-full p-[1px] flex items-center justify-center"
+      @click="$event.target.querySelector('input')?.click()"
     >
       <input
         v-if="submittable"
@@ -100,14 +101,15 @@
     </div>
     <div
       v-else-if="field.type === 'radio' && area.option_uuid"
-      class="w-full p-[0.2vw] flex items-center justify-center"
+      class="w-full p-[1px] flex items-center justify-center"
+      @click="$event.target.querySelector('input')?.click()"
     >
       <input
         v-if="submittable"
         type="radio"
         :value="false"
-        class="aspect-square base-radio"
+        class="aspect-square checked:checkbox checked:checkbox-xs"
-        :class="{ '!w-auto !h-full': area.w > area.h, '!w-full !h-auto': area.w <= area.h }"
+        :class="{ 'base-radio': !modelValue || modelValue !== optionValue(option), '!w-auto !h-full': area.w > area.h, '!w-full !h-auto': area.w <= area.h }"
         :checked="!!modelValue && modelValue === optionValue(option)"
         @click="$emit('update:model-value', optionValue(option))"
       >
@@ -119,7 +121,8 @@
     </div>
     <div
       v-else-if="field.type === 'multiple' && area.option_uuid"
-      class="w-full p-[0.2vw] flex items-center justify-center"
+      class="w-full p-[1px] flex items-center justify-center"
+      @click="$event.target.querySelector('input')?.click()"
     >
       <input
         v-if="submittable"
@@ -233,20 +236,20 @@ export default {
   computed: {
     fieldNames () {
       return {
-        text: 'Text',
+        text: this.t('text'),
-        cells: 'Text',
+        signature: this.t('signature'),
-        signature: 'Signature',
+        initials: this.t('initials'),
-        date: 'Date',
+        date: this.t('date'),
-        image: 'Image',
+        image: this.t('image'),
-        stamp: 'Stamp',
+        file: this.t('file'),
-        initials: 'Initials',
+        select: this.t('select'),
-        file: 'File',
+        checkbox: this.t('checkbox'),
-        select: 'Select',
+        multiple: this.t('multiple'),
-        checkbox: 'Checkbox',
+        radio: this.t('radio'),
-        radio: 'Radio',
+        cells: this.t('cells'),
-        multiple: 'Multiple Select',
+        stamp: this.t('stamp'),
-        phone: 'Phone',
+        payment: this.t('payment'),
-        payment: 'Payment'
+        phone: this.t('phone')
       }
     },
     option () {

app/javascript/submission_form/attachment_step.vue

@@ -42,7 +42,7 @@
       >
     </template>
     <FileDropzone
-      :message="`Upload ${field.name || 'Attachments'}${field.required ? '' : ' (optional)'}`"
+      :message="`${t('upload')} ${field.name || t('files')}${field.required ? '' : ` (${t('optional')})`}`"
       :submitter-slug="submitterSlug"
       :is-direct-upload="isDirectUpload"
       :multiple="true"
@@ -62,6 +62,7 @@ export default {
     IconPaperclip,
     IconTrashX
   },
+  inject: ['t'],
   props: {
     field: {
       type: Object,

app/javascript/submission_form/date_step.vue

@@ -4,7 +4,7 @@
       <label
         :for="field.uuid"
         class="label text-2xl"
-      >{{ field.name || t('date') }}
+      >{{ field.name && showFieldNames ? field.name : t('date') }}
         <template v-if="!field.required">({{ t('optional') }})</template>
       </label>
       <button
@@ -46,6 +46,11 @@ export default {
       type: Object,
       required: true
     },
+    showFieldNames: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     modelValue: {
       type: String,
       required: false,

app/javascript/submission_form/form.vue

@@ -4,7 +4,7 @@
     :steps="stepFields"
     :values="values"
     :attachments-index="attachmentsIndex"
-    :with-label="!isAnonymousChecboxes"
+    :with-label="!isAnonymousChecboxes && showFieldNames"
     :current-step="currentStepFields"
     @focus-step="[saveStep(), goToStep($event, false, true), currentField.type !== 'checkbox' ? isFormVisible = true : '']"
   />
@@ -64,6 +64,7 @@
             <TextStep
               :key="currentField.uuid"
               v-model="values[currentField.uuid]"
+              :show-field-names="showFieldNames"
               :field="currentField"
               @focus="scrollIntoField(currentField)"
             />
@@ -72,12 +73,13 @@
             v-else-if="currentField.type === 'date'"
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
+            :show-field-names="showFieldNames"
             :field="currentField"
             @focus="scrollIntoField(currentField)"
           />
           <div v-else-if="currentField.type === 'select'">
             <label
-              v-if="currentField.name"
+              v-if="showFieldNames && currentField.name"
               :for="currentField.uuid"
               dir="auto"
               class="label text-2xl mb-2"
@@ -116,15 +118,28 @@
           </div>
           <div v-else-if="currentField.type === 'radio'">
             <label
-              v-if="currentField.name"
+              v-if="showFieldNames && currentField.name"
               :for="currentField.uuid"
               dir="auto"
               class="label text-2xl mb-2"
             >{{ currentField.name }}
               <template v-if="!currentField.required">({{ t('optional') }})</template>
             </label>
-            <div class="flex w-full">
+            <div class="flex w-full max-h-44 overflow-y-auto">
-              <div class="space-y-3.5 mx-auto">
+              <div
+                v-if="!showFieldNames || (currentField.options.every((e) => !e.value) && currentField.options.length > 4)"
+                class="text-xl px-1"
+              >
+                <span
+                  @click="scrollIntoField(currentField)"
+                >
+                  {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ stepFields.length === currentStep + 1 ? t('submit') : t('next') }}</span>.
+                </span>
+              </div>
+              <div
+                class="space-y-3.5 mx-auto"
+                :class="{ hidden: !showFieldNames || (currentField.options.every((e) => !e.value) && currentField.options.length > 4) }"
+              >
                 <div
                   v-for="(option, index) in currentField.options"
                   :key="option.uuid"
@@ -154,6 +169,8 @@
             v-else-if="currentField.type === 'multiple'"
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
+            :show-field-names="showFieldNames"
+            :is-last-step="stepFields.length === currentStep + 1"
             :field="currentField"
           />
           <div
@@ -168,7 +185,7 @@
             <div
               class="space-y-3.5 mx-auto"
             >
-              <template v-if="isAnonymousChecboxes">
+              <template v-if="isAnonymousChecboxes || !showFieldNames">
                 <span class="text-xl">
                   {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ stepFields.length === currentStep + 1 ? t('submit') : t('next') }}</span>.
                 </span>
@@ -228,6 +245,7 @@
             :is-direct-upload="isDirectUpload"
             :attachments-index="attachmentsIndex"
             :submitter-slug="submitterSlug"
+            :show-field-names="showFieldNames"
             @attached="[attachments.push($event), scrollIntoField(currentField)]"
           />
           <SignatureStep
@@ -241,6 +259,7 @@
             :with-typed-signature="withTypedSignature"
             :attachments-index="attachmentsIndex"
             :submitter-slug="submitterSlug"
+            :show-field-names="showFieldNames"
             @attached="attachments.push($event)"
             @start="scrollIntoField(currentField)"
             @minimize="isFormVisible = false"
@@ -254,6 +273,7 @@
             :previous-value="previousInitialsValue"
             :is-direct-upload="isDirectUpload"
             :attachments-index="attachmentsIndex"
+            :show-field-names="showFieldNames"
             :submitter-slug="submitterSlug"
             @attached="attachments.push($event)"
             @start="scrollIntoField(currentField)"
@@ -276,6 +296,7 @@
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
             :field="currentField"
+            :show-field-names="showFieldNames"
             :default-value="submitter.phone"
             :submitter-slug="submitterSlug"
             @focus="scrollIntoField(currentField)"
@@ -376,7 +397,7 @@ import DateStep from './date_step'
 import FormCompleted from './completed'
 import { IconInnerShadowTop, IconArrowsDiagonal, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
 import AppearsOn from './appears_on'
-import { t } from './i18n'
+import i18n from './i18n'
 
 export default {
   name: 'SubmissionForm',
@@ -401,6 +422,7 @@ export default {
     return {
       baseUrl: this.baseUrl,
       scrollIntoArea: this.scrollIntoArea,
+      scrollIntoField: this.scrollIntoField,
       t: this.t
     }
   },
@@ -431,6 +453,11 @@ export default {
       required: false,
       default: false
     },
+    showFieldNames: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     withTypedSignature: {
       type: Boolean,
       required: false,
@@ -481,6 +508,11 @@ export default {
       required: false,
       default: true
     },
+    language: {
+      type: String,
+      required: false,
+      default: ''
+    },
     values: {
       type: Object,
       required: false,
@@ -522,6 +554,9 @@ export default {
     currentStepFields () {
       return this.stepFields[this.currentStep]
     },
+    browserLanguage () {
+      return (navigator.language || navigator.userLanguage || 'en').split('-')[0]
+    },
     queryParams () {
       return new URLSearchParams(window.location.search)
     },
@@ -639,7 +674,9 @@ export default {
     })
   },
   methods: {
-    t,
+    t (key) {
+      return i18n[this.language?.toLowerCase()]?.[key] || i18n[this.browserLanguage]?.[key] || i18n.en[key] || key
+    },
     maybeTrackEmailClick () {
       const { queryParams } = this
 

app/javascript/submission_form/i18n.js

@@ -1,4 +1,19 @@
 const en = {
+  text: 'Text',
+  signature: 'Signature',
+  initials: 'Initials',
+  date: 'Date',
+  image: 'Image',
+  take_photo: 'Take photo',
+  file: 'File',
+  select: 'Select',
+  checkbox: 'Checkbox',
+  multiple: 'Multiple',
+  radio: 'Radio',
+  cells: 'Cells',
+  stamp: 'Stamp',
+  payment: 'Payment',
+  phone: 'Phone',
   submit_form: 'Submit Form',
   type_here_: 'Type here...',
   optional: 'optional',
@@ -13,8 +28,6 @@ const en = {
   or_drag_and_drop_files: 'or drag and drop files',
   send_copy_via_email: 'Send copy via email',
   download: 'Download',
-  signature: 'Signature',
-  initials: 'Initials',
   clear: 'Clear',
   redraw: 'Redraw',
   draw_initials: 'Draw initials',
@@ -40,13 +53,30 @@ const en = {
   draw: 'Draw',
   type: 'Type',
   type_text: 'Type text',
-  date: 'Date',
   email_has_been_sent: 'Email has been sent',
   processing: 'Processing',
-  pay_with_strip: 'Pay with Stripe'
+  pay_with_strip: 'Pay with Stripe',
+  reupload: 'Reupload',
+  upload: 'Upload',
+  files: 'Files'
 }
 
 const es = {
+  text: 'Texto',
+  signature: 'Firma',
+  initials: 'Iniciales',
+  date: 'Fecha',
+  image: 'Imagen',
+  file: 'Archivo',
+  select: 'Seleccionar',
+  checkbox: 'Casilla',
+  multiple: 'Múltiple',
+  radio: 'Radio',
+  cells: 'Celdas',
+  stamp: 'Sello',
+  payment: 'Pago',
+  phone: 'Teléfono',
+  take_photo: 'Tomar foto',
   submit_form: 'Enviar Formulario',
   type_here_: 'Escribe aquí...',
   optional: 'opcional',
@@ -60,8 +90,6 @@ const es = {
   or_drag_and_drop_files: 'o arrastra y suelta archivos',
   send_copy_via_email: 'Enviar copia por correo electrónico',
   download: 'Descargar',
-  signature: 'Firma',
-  initials: 'Iniciales',
   clear: 'Borrar',
   redraw: 'Redibujar',
   draw_initials: 'Dibujar iniciales',
@@ -81,7 +109,6 @@ const es = {
   verification_code_has_been_resent: 'El código de verificación ha sido reenviado por SMS',
   please_fill_all_required_fields: 'Por favor, complete todos los campos obligatorios',
   set_today: 'Establecer Hoy',
-  date: 'Fecha',
   toggle_multiline_text: 'Alternar Texto Multilínea',
   draw_signature: 'Dibujar firma',
   type_initial: 'Escribir iniciales',
@@ -90,15 +117,33 @@ const es = {
   type_text: 'Escribir texto',
   email_has_been_sent: 'El correo electrónico ha sido enviado',
   processing: 'Procesando',
-  pay_with_strip: 'Pagar con Stripe'
+  pay_with_strip: 'Pagar con Stripe',
+  reupload: 'Volver a subir',
+  upload: 'Subir',
+  files: 'Archivos'
 }
 
 const it = {
+  text: 'Testo',
+  signature: 'Firma',
+  initials: 'Iniziali',
+  date: 'Data',
+  image: 'Immagine',
+  file: 'File',
+  select: 'Seleziona',
+  checkbox: 'Casella di controllo',
+  multiple: 'Multiplo',
+  radio: 'Radio',
+  cells: 'Celle',
+  stamp: 'Timbro',
+  payment: 'Pagamento',
+  phone: 'Telefono',
   submit_form: 'Invia Modulo',
   type_here_: 'Digita qui...',
   optional: 'opzionale',
   appears_on: 'Compare su',
   page: 'Pagina',
+  take_photo: 'Scattare una foto',
   select_your_option: 'Seleziona la tua opzione',
   complete_hightlighted_checkboxes_and_click: 'Completa le caselle evidenziate e fai clic',
   submit: 'invia',
@@ -107,8 +152,6 @@ const it = {
   or_drag_and_drop_files: 'oppure trascina e rilascia i file',
   send_copy_via_email: 'Invia copia via email',
   download: 'Scarica',
-  signature: 'Firma',
-  initials: 'Iniziali',
   clear: 'Cancella',
   redraw: 'Ridisegna',
   draw_initials: 'Disegna iniziali',
@@ -128,7 +171,6 @@ const it = {
   verification_code_has_been_resent: 'Il codice di verifica è stato rinviato tramite SMS',
   please_fill_all_required_fields: 'Si prega di compilare tutti i campi obbligatori',
   set_today: 'Imposta Oggi',
-  date: 'Data',
   draw_signature: 'Disegna firma',
   type_initial: 'Inserisci iniziali',
   draw: 'Disegna',
@@ -137,15 +179,33 @@ const it = {
   toggle_multiline_text: 'Attiva Testo Multilinea',
   email_has_been_sent: "L'email è stata inviata",
   processing: 'Elaborazione',
-  pay_with_strip: 'Paga con Stripe'
+  pay_with_strip: 'Paga con Stripe',
+  reupload: 'Ricarica',
+  upload: 'Carica',
+  files: 'File'
 }
 
 const de = {
+  text: 'Text',
+  signature: 'Unterschrift',
+  initials: 'Initialen',
+  date: 'Datum',
+  image: 'Bild',
+  file: 'Datei',
+  select: 'Auswählen',
+  checkbox: 'Checkbox',
+  multiple: 'Mehrere',
+  radio: 'Radio',
+  cells: 'Zellen',
+  stamp: 'Stempel',
+  payment: 'Zahlung',
+  phone: 'Telefon',
   submit_form: 'Formular absenden',
   type_here_: 'Hier eingeben...',
   optional: 'optional',
   appears_on: 'Erscheint auf',
   page: 'Seite',
+  take_photo: 'Foto aufnehmen',
   select_your_option: 'Wähle deine Option',
   complete_hightlighted_checkboxes_and_click: 'Markierte Kontrollkästchen ausfüllen und klicken',
   submit: 'absenden',
@@ -154,8 +214,6 @@ const de = {
   or_drag_and_drop_files: 'oder Dateien hierher ziehen und ablegen',
   send_copy_via_email: 'Kopie per E-Mail senden',
   download: 'Herunterladen',
-  signature: 'Unterschrift',
-  initials: 'Initialen',
   clear: 'Löschen',
   redraw: 'Neu zeichnen',
   draw_initials: 'Initialen zeichnen',
@@ -175,7 +233,6 @@ const de = {
   verification_code_has_been_resent: 'Die Verifizierungscode wurde erneut per SMS gesendet',
   please_fill_all_required_fields: 'Bitte füllen Sie alle erforderlichen Felder aus',
   set_today: 'Heute einstellen',
-  date: 'Datum',
   draw_signature: 'Unterschrift zeichnen',
   type_initial: 'Initialen eingeben',
   draw: 'Zeichnen',
@@ -184,15 +241,33 @@ const de = {
   toggle_multiline_text: 'Mehrzeiligen Text umschalten',
   email_has_been_sent: 'Die E-Mail wurde gesendet',
   processing: 'Verarbeitung',
-  pay_with_strip: 'Mit Stripe bezahlen'
+  pay_with_strip: 'Mit Stripe bezahlen',
+  reupload: 'Erneut hochladen',
+  upload: 'Hochladen',
+  files: 'Dateien'
 }
 
 const fr = {
+  text: 'Texte',
+  signature: 'Signature',
+  initials: 'Initiales',
+  date: 'Date',
+  image: 'Image',
+  file: 'Fichier',
+  select: 'Choisir',
+  checkbox: 'Coche',
+  multiple: 'Multiple',
+  radio: 'Radio',
+  cells: 'Cellules',
+  stamp: 'Tampon',
+  payment: 'Paiement',
+  phone: 'Téléphone',
   submit_form: 'Envoyer le Formulaire',
   type_here_: 'Tapez ici...',
   optional: 'facultatif',
   appears_on: 'Apparaît sur',
   page: 'Page',
+  take_photo: 'Prendre une photo',
   select_your_option: 'Sélectionnez votre option',
   complete_hightlighted_checkboxes_and_click: 'Complétez les cases à cocher en surbrillance et cliquez',
   submit: 'envoyer',
@@ -201,8 +276,6 @@ const fr = {
   or_drag_and_drop_files: 'ou faites glisser-déposer les fichiers',
   send_copy_via_email: 'Envoyer une copie par e-mail',
   download: 'Télécharger',
-  signature: 'Signature',
-  initials: 'Initiales',
   clear: 'Effacer',
   redraw: 'Redessiner',
   draw_initials: 'Dessiner les initiales',
@@ -222,7 +295,6 @@ const fr = {
   verification_code_has_been_resent: 'Le code de vérification a été renvoyé par SMS',
   please_fill_all_required_fields: 'Veuillez remplir tous les champs obligatoires',
   set_today: "Définir Aujourd'hui",
-  date: 'Date',
   draw_signature: 'Dessiner une signature',
   type_initial: 'Saisir les initiales',
   draw: 'Dessiner',
@@ -231,10 +303,27 @@ const fr = {
   toggle_multiline_text: 'Basculer le Texte Multiligne',
   email_has_been_sent: "L'email a été envoyé",
   processing: 'Traitement',
-  pay_with_strip: 'Paiement avec Stripe'
+  pay_with_strip: 'Paiement avec Stripe',
+  reupload: 'Recharger',
+  upload: 'Télécharger',
+  files: 'Fichiers'
 }
 
 const pl = {
+  text: 'Tekst',
+  signature: 'Podpis',
+  initials: 'Inicjały',
+  date: 'Data',
+  image: 'Obraz',
+  file: 'Plik',
+  select: 'Wybierz',
+  checkbox: 'Pole wyboru',
+  multiple: 'Wielokrotne',
+  radio: 'Radio',
+  cells: 'Komórki',
+  stamp: 'Pieczątka',
+  payment: 'Płatność',
+  phone: 'Telefon',
   submit_form: 'Wyślij Formularz',
   type_here_: 'Wpisz tutaj...',
   optional: 'opcjonalny',
@@ -244,12 +333,11 @@ const pl = {
   complete_hightlighted_checkboxes_and_click: 'Wypełnij zaznaczone pola wyboru i kliknij',
   submit: 'wyślij',
   next: 'dalej',
+  take_photo: 'Zrób zdjęcie',
   click_to_upload: 'Kliknij, aby przesłać',
   or_drag_and_drop_files: 'lub przeciągnij i upuść pliki',
   send_copy_via_email: 'Wyślij kopię drogą mailową',
   download: 'Pobierz',
-  signature: 'Podpis',
-  initials: 'Inicjały',
   clear: 'Wyczyść',
   redraw: 'Przerysuj',
   draw_initials: 'Narysuj inicjały',
@@ -269,7 +357,6 @@ const pl = {
   verification_code_has_been_resent: 'Kod weryfikacyjny został ponownie wysłany',
   please_fill_all_required_fields: 'Proszę wypełnić wszystkie wymagane pola',
   set_today: 'Ustaw Dziś',
-  date: 'Data',
   draw_signature: 'Rysuj podpis',
   type_initial: 'Wprowadź inicjały',
   draw: 'Rysuj',
@@ -278,15 +365,33 @@ const pl = {
   toggle_multiline_text: 'Przełącz Tekst Wielolinijkowy',
   email_has_been_sent: 'E-mail został wysłany',
   processing: 'Przetwarzanie',
-  pay_with_strip: 'Płatność za pomocą Stripe'
+  pay_with_strip: 'Płatność za pomocą Stripe',
+  reupload: 'Ponowne przesłanie',
+  upload: 'Przesyłanie',
+  files: 'Pliki'
 }
 
 const uk = {
+  text: 'Текст',
+  signature: 'Підпис',
+  initials: 'Ініціали',
+  date: 'Дата',
+  image: 'Зображення',
+  file: 'Файл',
+  select: 'Вибрати',
+  checkbox: 'Прапорець',
+  multiple: 'Множинний',
+  radio: 'Радіо',
+  cells: 'Клітинки',
+  stamp: 'Штамп',
+  payment: 'Платіж',
+  phone: 'Телефон',
   submit_form: 'Надіслати Форму',
   type_here_: 'Введіть тут',
   optional: 'необов’язково',
   appears_on: "З'являється на",
   page: 'Сторінка',
+  take_photo: 'Зробити фото',
   select_your_option: 'Виберіть варіант',
   complete_hightlighted_checkboxes_and_click: 'Заповніть позначені прапорці та натисніть',
   submit: 'надіслати',
@@ -295,8 +400,6 @@ const uk = {
   or_drag_and_drop_files: 'або перетягніть файли сюди',
   send_copy_via_email: 'Надіслати копію електронною поштою',
   download: 'Завантажити',
-  signature: 'Підпис',
-  initials: 'Ініціали',
   clear: 'Очистити',
   redraw: 'Перемалювати',
   draw_initials: 'Намалювати ініціали',
@@ -316,7 +419,6 @@ const uk = {
   verification_code_has_been_resent: 'Код підтвердження був повторно надісланий',
   please_fill_all_required_fields: "Будь ласка, заповніть всі обов'язкові поля",
   set_today: 'Задати Сьогодні',
-  date: 'Дата',
   draw_signature: 'Намалюйте підпис',
   type_initial: 'Введіть ініціали',
   draw: 'Підпис',
@@ -325,16 +427,34 @@ const uk = {
   toggle_multiline_text: 'Перемкнути Багаторядковий Текст',
   email_has_been_sent: 'Електронний лист був відправлений',
   processing: 'Обробка',
-  pay_with_strip: 'Сплатити за допомогою Stripe'
+  pay_with_strip: 'Сплатити за допомогою Stripe',
+  reupload: 'Перезавантажити',
+  upload: 'Завантажити',
+  files: 'Файли'
 }
 
 const cs = {
+  text: 'Text',
+  signature: 'Podpis',
+  initials: 'Iniciály',
+  date: 'Datum',
+  image: 'Obrázek',
+  file: 'Soubor',
+  select: 'Vybrat',
+  checkbox: 'Zaškrtávací políčko',
+  multiple: 'Více možností',
+  radio: 'Rádio',
+  cells: 'Buňky',
+  stamp: 'Razítko',
+  payment: 'Platba',
+  phone: 'Telefon',
   submit_form: 'Odeslat formulář',
   type_here_: 'Zadejte zde',
   optional: 'volitelné',
   appears_on: 'Zobrazuje se na',
   page: 'Stránka',
   select_your_option: 'Vyberte svou volbu',
+  take_photo: 'Fotit',
   complete_hightlighted_checkboxes_and_click: 'Označte zvýrazněné zaškrtávací políčka a klikněte na',
   submit: 'odeslat',
   next: 'další',
@@ -342,8 +462,6 @@ const cs = {
   or_drag_and_drop_files: 'nebo přetáhněte soubory sem',
   send_copy_via_email: 'Odeslat kopii e-mailem',
   download: 'Stáhnout',
-  signature: 'Podpis',
-  initials: 'Iniciály',
   clear: 'Smazat',
   redraw: 'Překreslit',
   draw_initials: 'Nakreslit iniciály',
@@ -363,7 +481,6 @@ const cs = {
   verification_code_has_been_resent: 'Ověřovací kód byl znovu odeslán',
   please_fill_all_required_fields: 'Prosím vyplňte všechny povinné položky',
   set_today: 'Nastavit Dnes',
-  date: 'Datum',
   draw_signature: 'Nakreslit podpis',
   type_initial: 'Zadat iniciály',
   draw: 'Kreslit',
@@ -372,15 +489,33 @@ const cs = {
   toggle_multiline_text: 'Přepnout Víceřádkový Text',
   email_has_been_sent: 'E-mail byl odeslán',
   processing: 'Zpracování',
-  pay_with_strip: 'Zaplacení přes Stripe'
+  pay_with_strip: 'Zaplacení přes Stripe',
+  reupload: 'Znovu nahrát',
+  upload: 'Nahrát',
+  files: 'Soubory'
 }
 
 const pt = {
+  text: 'Texto',
+  signature: 'Assinatura',
+  initials: 'Iniciais',
+  date: 'Data',
+  image: 'Imagem',
+  file: 'Arquivo',
+  select: 'Selecionar',
+  checkbox: 'Caixa',
+  multiple: 'Múltiplo',
+  radio: 'Rádio',
+  cells: 'Células',
+  stamp: 'Carimbo',
+  payment: 'Pagamento',
+  phone: 'Telefone',
   submit_form: 'Enviar Formulário',
   type_here_: 'Digite aqui',
   optional: 'opcional',
   appears_on: 'Aparece em',
   page: 'Página',
+  take_photo: 'Tirar foto',
   select_your_option: 'Selecione sua opção',
   complete_hightlighted_checkboxes_and_click: 'Complete as caixas de seleção destacadas e clique',
   submit: 'enviar',
@@ -389,8 +524,6 @@ const pt = {
   or_drag_and_drop_files: 'ou arraste e solte arquivos',
   send_copy_via_email: 'Enviar cópia por e-mail',
   download: 'Baixar',
-  signature: 'Assinatura',
-  initials: 'Iniciais',
   clear: 'Limpar',
   redraw: 'Redesenhar',
   draw_initials: 'Desenhar iniciais',
@@ -410,7 +543,6 @@ const pt = {
   verification_code_has_been_resent: 'O código de verificação foi reenviado via SMS',
   please_fill_all_required_fields: 'Por favor, preencha todos os campos obrigatórios',
   set_today: 'Definir Hoje',
-  date: 'Data',
   draw_signature: 'Desenhar assinatura',
   type_initial: 'Inserir iniciais',
   draw: 'Desenhar',
@@ -419,16 +551,34 @@ const pt = {
   toggle_multiline_text: 'Alternar Texto Multilinha',
   email_has_been_sent: 'Email enviado',
   processing: 'Processamento',
-  pay_with_strip: 'Pagar com Stripe'
+  pay_with_strip: 'Pagar com Stripe',
+  reupload: 'Reenviar',
+  upload: 'Carregar',
+  files: 'Arquivos'
 }
 
 const he = {
+  text: 'טקסט',
+  signature: 'חתימה',
+  initials: 'ראשי תיקיות',
+  date: 'תאריך',
+  image: 'תמונה',
+  file: 'קובץ',
+  select: 'בחר',
+  checkbox: 'תיק בחירה',
+  multiple: 'רב ערכים',
+  radio: 'רדיו',
+  cells: 'תאים',
+  stamp: 'חותמת',
+  payment: 'תשלום',
+  phone: 'טלפון',
   submit_form: 'שלח טופס',
   type_here_: 'הקלד כאן',
   optional: 'אופציונלי',
   option: 'אפשרות',
   appears_on: 'מופיע ב',
   page: 'עמוד',
+  take_photo: 'צלם תמונה',
   select_your_option: 'בחר את האפשרות שלך',
   complete_hightlighted_checkboxes_and_click: 'השלם את תיבות הסימון המודגשות ולחץ',
   submit: 'שליחה',
@@ -437,8 +587,6 @@ const he = {
   or_drag_and_drop_files: 'או גרור ושחרר קבצים',
   send_copy_via_email: 'שלח עותק באמצעות אימייל',
   download: 'הורדה',
-  signature: 'חתימה',
-  initials: 'ציוני ראשי תיבות',
   clear: 'נקה',
   redraw: 'צייר מחדש',
   draw_initials: 'צייר ציוני ראשי תיבות',
@@ -464,17 +612,77 @@ const he = {
   draw: 'צייר',
   type: 'הקלד',
   type_text: 'הקלד טקסט',
-  date: 'תאריך',
   email_has_been_sent: 'האימייל נשלח',
   processing: 'מעבד',
-  pay_with_strip: 'שלם עם סטרייפ'
+  pay_with_strip: 'שלם עם סטרייפ',
+  reupload: 'העלה שוב',
+  upload: 'העלאה',
+  files: 'קבצים'
 }
 
-const i18n = { en, es, it, de, fr, pl, uk, cs, pt, he }
+const nl = {
+  text: 'Tekst',
+  signature: 'Handtekening',
+  initials: 'Initialen',
+  date: 'Datum',
+  image: 'Afbeelding',
+  take_photo: 'Maak een foto',
+  file: 'Bestand',
+  select: 'Selecteer',
+  checkbox: 'Aankruisvakje',
+  multiple: 'Meerdere',
+  radio: 'Radio',
+  cells: 'Cellen',
+  stamp: 'Stempel',
+  payment: 'Betaling',
+  phone: 'Telefoon',
+  submit_form: 'Formulier verzenden',
+  type_here_: 'Typ hier...',
+  optional: 'Optioneel',
+  option: 'Optie',
+  appears_on: 'Verschijnt op',
+  page: 'Pagina',
+  select_your_option: 'Selecteer uw optie',
+  complete_hightlighted_checkboxes_and_click: 'Voltooi de gemarkeerde selectievakjes en klik',
+  submit: 'Verzenden',
+  next: 'Volgende',
+  click_to_upload: 'Klik om te uploaden',
+  or_drag_and_drop_files: 'of sleep en plaats bestanden',
+  send_copy_via_email: 'Stuur kopie per e-mail',
+  download: 'Downloaden',
+  clear: 'Wissen',
+  redraw: 'Opnieuw tekenen',
+  draw_initials: 'Initialen tekenen',
+  type_signature_here: 'Typ hier uw handtekening',
+  type_initial_here: 'Typ hier uw initialen',
+  form_has_been_completed: 'Formulier is voltooid!',
+  create_a_free_account: 'Maak een gratis account aan',
+  signed_with: 'Ondertekend met',
+  please_check_the_box_to_continue: 'Vink het vakje aan om door te gaan',
+  open_source_documents_software: 'Open source documenten software',
+  verified_phone_number: 'Geverifieerd telefoonnummer',
+  use_international_format: 'Gebruik internationaal formaat: +1xxx',
+  six_digits_code: '6-cijferige code',
+  change_phone_number: 'Wijzig telefoonnummer',
+  sending: 'Verzenden...',
+  resend_code: 'Code opnieuw verzenden',
+  verification_code_has_been_resent: 'Verificatiecode is opnieuw verzonden via SMS',
+  please_fill_all_required_fields: 'Vul alle verplichte velden in',
+  set_today: 'Stel vandaag in',
+  toggle_multiline_text: 'Schakel meerregelige tekst in/uit',
+  draw_signature: 'Handtekening tekenen',
+  type_initial: 'Typ initialen',
+  draw: 'Tekenen',
+  type: 'Typen',
+  type_text: 'Typ tekst',
+  email_has_been_sent: 'E-mail is verzonden',
+  processing: 'Verwerken',
+  pay_with_strip: 'Betalen met Stripe',
+  reupload: 'Opnieuw uploaden',
+  upload: 'Uploaden',
+  files: 'Bestanden'
+}
 
-const browserLanguage = (navigator.language || navigator.userLanguage || 'en').split('-')[0]
+const i18n = { en, es, it, de, fr, pl, uk, cs, pt, he, nl }
-
-const t = (key) => i18n[browserLanguage]?.[key] || i18n.en[key] || key
 
 export default i18n
-export { t }

app/javascript/submission_form/image_step.vue

@@ -3,13 +3,13 @@
     <div class="flex justify-between items-center w-full mb-2">
       <label
         class="label text-2xl"
-      >{{ field.name || 'Image' }}</label>
+      >{{ showFieldNames && field.name ? field.name : t('image') }}</label>
       <button
         class="btn btn-outline btn-sm"
         @click.prevent="remove"
       >
         <IconReload :width="16" />
-        Reupload
+        {{ t('reupload') }}
       </button>
     </div>
     <div>
@@ -27,7 +27,7 @@
   <div>
     <FileDropzone
       v-if="!modelValue"
-      :message="`Upload ${field.name || 'Image'}${field.required ? '' : ' (optional)'}`"
+      :message="`${t('upload')} ${field.name || t('image')}${field.required ? '' : ` (${t('optional')})`}`"
       :submitter-slug="submitterSlug"
       :accept="'image/*'"
       :is-direct-upload="isDirectUpload"
@@ -46,6 +46,7 @@ export default {
     FileDropzone,
     IconReload
   },
+  inject: ['t'],
   props: {
     field: {
       type: Object,
@@ -56,6 +57,11 @@ export default {
       required: true,
       default: false
     },
+    showFieldNames: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     submitterSlug: {
       type: String,
       required: true

app/javascript/submission_form/initials_step.vue

@@ -3,7 +3,7 @@
     <div class="flex justify-between items-center w-full mb-2">
       <label
         class="label text-2xl"
-      >{{ field.name || t('initials') }}</label>
+      >{{ showFieldNames && field.name ? field.name : t('initials') }}</label>
       <div class="space-x-2 flex">
         <span
           v-if="isDrawInitials"
@@ -125,6 +125,11 @@ export default {
       type: String,
       required: true
     },
+    showFieldNames: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     isDirectUpload: {
       type: Boolean,
       required: true,

app/javascript/submission_form/multi_select_step.vue

@@ -1,11 +1,11 @@
 <template>
   <label
-    v-if="field.name"
+    v-if="showFieldNames && field.name"
     :for="field.uuid"
     dir="auto"
     class="label text-2xl mb-2"
   >{{ field.name }}</label>
-  <div class="flex w-full">
+  <div class="flex w-full max-h-44 overflow-y-auto">
     <input
       v-if="modelValue.length === 0"
       type="text"
@@ -13,7 +13,18 @@
       :value="''"
       class="hidden"
     >
-    <div class="space-y-3.5 mx-auto">
+    <div
+      v-if="!showOptions"
+      class="text-xl px-1"
+    >
+      <span @click="scrollIntoField(field)">
+        {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ isLastStep ? t('submit') : t('next') }}</span>.
+      </span>
+    </div>
+    <div
+      class="space-y-3.5 mx-auto"
+      :class="{ hidden: !showOptions }"
+    >
       <div
         v-for="(option, index) in field.options"
         :key="option.uuid"
@@ -44,12 +55,22 @@
 <script>
 export default {
   name: 'MultiSelectStep',
-  inject: ['t'],
+  inject: ['t', 'scrollIntoField'],
   props: {
     field: {
       type: Object,
       required: true
     },
+    isLastStep: {
+      type: Boolean,
+      required: true,
+      default: false
+    },
+    showFieldNames: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     modelValue: {
       type: Array,
       required: false,
@@ -62,6 +83,11 @@ export default {
       inputRefs: []
     }
   },
+  computed: {
+    showOptions () {
+      return this.showFieldNames && (this.field.options.some((e) => e.value) || this.field.options.length < 5)
+    }
+  },
   beforeUpdate () {
     this.inputRefs = []
   },

app/javascript/submission_form/phone_step.vue

@@ -3,7 +3,7 @@
     <label
       :for="isCodeSent ? 'one_time_code' : field.uuid"
       class="label text-2xl mb-2"
-    >{{ field.name || t('verified_phone_number') }}
+    >{{ showFieldNames && field.name ? field.name : t('verified_phone_number') }}
       <template v-if="!field.required">({{ t('optional') }})</template>
     </label>
     <div>
@@ -93,6 +93,11 @@ export default {
       type: String,
       required: true
     },
+    showFieldNames: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     modelValue: {
       type: String,
       required: false,
@@ -140,7 +145,11 @@ export default {
       })
     },
     async submit () {
-      if (!this.isCodeSent) {
+      if (!this.$refs.phone.value.toString().startsWith('+')) {
+        alert(this.t('use_international_format'))
+
+        return Promise.reject(new Error('phone invalid'))
+      } else if (!this.isCodeSent) {
         this.sendVerificationCode()
 
         this.$emit('update:model-value', this.$refs.phone.value)

app/javascript/submission_form/signature_step.vue

@@ -3,7 +3,7 @@
     <div class="flex justify-between items-center w-full mb-2">
       <label
         class="label text-2xl"
-      >{{ field.name || t('signature') }}</label>
+      >{{ showFieldNames && field.name ? field.name : t('signature') }}</label>
       <div class="space-x-2 flex">
         <span
           v-if="isTextSignature"
@@ -41,7 +41,7 @@
         </span>
         <span
           class="tooltip"
-          data-tip="Take photo"
+          :data-tip="t('take_photo')"
         >
           <label
             class="btn btn-outline btn-sm font-medium"
@@ -147,6 +147,11 @@ export default {
       type: String,
       required: true
     },
+    showFieldNames: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     isDirectUpload: {
       type: Boolean,
       required: true,
@@ -221,7 +226,7 @@ export default {
     },
     loadFont () {
       if (!isFontLoaded) {
-        const font = new FontFace('Dancing Script', `url(${this.baseUrl}/fonts/DancingScript.otf) format("opentype")`)
+        const font = new FontFace('Dancing Script', `url(${this.baseUrl}/fonts/DancingScript-Regular.otf) format("opentype")`)
 
         font.load().then((loadedFont) => {
           document.fonts.add(loadedFont)
@@ -260,6 +265,7 @@ export default {
     },
     toggleTextInput () {
       this.remove()
+      this.clear()
       this.isTextSignature = !this.isTextSignature
 
       if (this.isTextSignature) {

app/javascript/submission_form/text_step.vue

@@ -1,6 +1,6 @@
 <template>
   <label
-    v-if="field.name"
+    v-if="showFieldNames && field.name"
     :for="field.uuid"
     dir="auto"
     class="label text-2xl"
@@ -26,7 +26,8 @@
       v-model="text"
       :maxlength="cellsMaxLegth"
       dir="auto"
-      class="base-input !text-2xl w-full !pr-11 -mr-10"
+      class="base-input !text-2xl w-full"
+      :class="{ '!pr-11 -mr-10': !field.validation?.pattern }"
       :required="field.required"
       :pattern="field.validation?.pattern"
       :oninvalid="field.validation?.message ? `this.setCustomValidity(${JSON.stringify(field.validation.message)})` : ''"
@@ -50,7 +51,7 @@
       @focus="$emit('focus')"
     />
     <div
-      v-if="!isTextArea && field.type !== 'cells'"
+      v-if="!isTextArea && field.type !== 'cells' && !field.validation?.pattern"
       class="tooltip"
       :data-tip="t('toggle_multiline_text')"
     >
@@ -81,6 +82,11 @@ export default {
       type: Object,
       required: true
     },
+    showFieldNames: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     modelValue: {
       type: String,
       required: false,

app/javascript/template_builder/area.vue

@@ -43,7 +43,8 @@
         class="border-r"
         :compact="true"
         :editable="editable && !defaultField"
-        :menu-classes="'dropdown-content bg-white menu menu-xs p-2 shadow rounded-box w-52 rounded-t-none -left-[1px]'"
+        :allow-add-new="!defaultSubmitters.length"
+        :menu-classes="'dropdown-content bg-white menu menu-xs p-2 shadow rounded-box w-52 rounded-t-none -left-[1px] mt-[1px]'"
         :submitters="template.submitters"
         @update:model-value="save"
         @click="selectedAreaRef.value = area"
@@ -166,6 +167,11 @@ export default {
       required: false,
       default: null
     },
+    defaultSubmitters: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
     editable: {
       type: Boolean,
       required: false,

app/javascript/template_builder/builder.vue

@@ -148,6 +148,7 @@
                 :is-drag="!!dragField"
                 :default-fields="defaultFields"
                 :allow-draw="!onlyDefinedFields"
+                :default-submitters="defaultSubmitters"
                 :draw-field="drawField"
                 :editable="editable"
                 :base-url="baseUrl"
@@ -185,25 +186,6 @@
             </div>
           </template>
         </div>
-        <MobileDrawField
-          v-if="drawField && isBreakpointLg"
-          :draw-field="drawField"
-          :fields="template.fields"
-          :submitters="template.submitters"
-          :selected-submitter="selectedSubmitter"
-          class="md:hidden"
-          :editable="editable"
-          @cancel="[drawField = null, drawOption = null]"
-          @change-submitter="[selectedSubmitter = $event, drawField.submitter_uuid = $event.uuid]"
-        />
-        <MobileFields
-          v-if="sortedDocuments.length && !drawField && editable"
-          :fields="template.fields"
-          :default-fields="defaultFields"
-          :field-types="fieldTypes"
-          :selected-submitter="selectedSubmitter"
-          @select="startFieldDraw($event)"
-        />
       </div>
       <div
         v-if="withFieldsList"
@@ -259,6 +241,27 @@
         </div>
       </div>
     </div>
+    <div class="sticky bottom-0">
+      <MobileDrawField
+        v-if="drawField && isBreakpointLg"
+        :draw-field="drawField"
+        :fields="template.fields"
+        :submitters="template.submitters"
+        :selected-submitter="selectedSubmitter"
+        class="md:hidden"
+        :editable="editable"
+        @cancel="[drawField = null, drawOption = null]"
+        @change-submitter="[selectedSubmitter = $event, drawField.submitter_uuid = $event.uuid]"
+      />
+      <MobileFields
+        v-if="sortedDocuments.length && !drawField && editable"
+        :fields="template.fields"
+        :default-fields="defaultFields"
+        :field-types="fieldTypes"
+        :selected-submitter="selectedSubmitter"
+        @select="startFieldDraw($event)"
+      />
+    </div>
   </div>
 </template>
 
@@ -301,6 +304,7 @@ export default {
       template: this.template,
       save: this.save,
       t: this.t,
+      currencies: this.currencies,
       baseFetch: this.baseFetch,
       fieldTypes: this.fieldTypes,
       backgroundColor: this.backgroundColor,
@@ -349,6 +353,11 @@ export default {
       required: false,
       default: () => []
     },
+    currencies: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
     fieldTypes: {
       type: Array,
       required: false,

app/javascript/template_builder/document.vue

@@ -10,6 +10,7 @@
       :allow-draw="allowDraw"
       :is-drag="isDrag"
       :default-fields="defaultFields"
+      :default-submitters="defaultSubmitters"
       :draw-field="drawField"
       :selected-submitter="selectedSubmitter"
       :image="image"
@@ -42,6 +43,11 @@ export default {
       required: false,
       default: () => []
     },
+    defaultSubmitters: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
     allowDraw: {
       type: Boolean,
       required: false,

app/javascript/template_builder/field_submitter.vue

@@ -125,7 +125,8 @@
         />
       </div>
       <span class="flex items-center transition-all duration-75 group-hover:border border-base-content/20 border-dashed w-6 h-6 flex justify-center items-center rounded">
-        <IconPlus
+        <component
+          :is="editable ? 'IconPlus' : 'IconChevronDown'"
           width="18"
           height="18"
         />
@@ -188,7 +189,7 @@
           </div>
         </a>
       </li>
-      <li v-if="submitters.length < 10 && editable">
+      <li v-if="submitters.length < 10 && editable && allowAddNew">
         <a
           href="#"
           class="flex px-2"
@@ -208,7 +209,7 @@
 </template>
 
 <script>
-import { IconUserPlus, IconTrashX, IconPlus, IconChevronUp } from '@tabler/icons-vue'
+import { IconUserPlus, IconTrashX, IconPlus, IconChevronUp, IconChevronDown } from '@tabler/icons-vue'
 import Contenteditable from './contenteditable'
 import { v4 } from 'uuid'
 
@@ -216,6 +217,7 @@ export default {
   name: 'FieldSubmitter',
   components: {
     IconUserPlus,
+    IconChevronDown,
     Contenteditable,
     IconPlus,
     IconTrashX,
@@ -242,6 +244,11 @@ export default {
       required: false,
       default: false
     },
+    allowAddNew: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     modelValue: {
       type: String,
       required: true

app/javascript/template_builder/mobile_draw_field.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="fixed text-center w-full bottom-0 pr-6 mb-4">
+  <div class="absolute text-center w-full bottom-0 pr-3 mb-4">
     <span class="w-full bg-base-200 px-4 py-2 rounded-md inline-flex space-x-2 mx-auto items-center justify-between mb-2 z-20 md:hidden">
       <div class="flex items-center space-x-2">
         <component

app/javascript/template_builder/mobile_fields.vue

@@ -1,6 +1,6 @@
 <template>
   <span
-    class="dropdown dropdown-top dropdown-end fixed bottom-4 right-4 z-10 md:hidden"
+    class="dropdown dropdown-top dropdown-end absolute bottom-4 right-4 z-10 md:hidden"
   >
     <label
       class="btn btn-neutral text-white btn-circle btn-lg group"

app/javascript/template_builder/page.vue

@@ -24,6 +24,7 @@
         :field="item.field"
         :editable="editable"
         :default-field="defaultFields.find((f) => f.name === item.field.name)"
+        :default-submitters="defaultSubmitters"
         @start-resize="resizeDirection = $event"
         @stop-resize="resizeDirection = null"
         @start-drag="isMove = true"
@@ -85,6 +86,11 @@ export default {
       type: Object,
       required: true
     },
+    defaultSubmitters: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
     drawField: {
       type: Object,
       required: false,

app/javascript/template_builder/payment_settings.vue

@@ -31,7 +31,7 @@
           @change="save"
         >
           <option
-            v-for="currency in currencies"
+            v-for="currency in currenciesList"
             :key="currency"
             :value="currency"
           >
@@ -167,7 +167,7 @@ export default {
     IconInnerShadowTop,
     IconBrandStripe
   },
-  inject: ['backgroundColor', 'save'],
+  inject: ['backgroundColor', 'save', 'currencies'],
   props: {
     field: {
       type: Object,
@@ -187,9 +187,12 @@ export default {
     redirectUri () {
       return document.location.origin + '/auth/stripe_connect/callback'
     },
-    currencies () {
+    defaultCurrencies () {
       return ['USD', 'EUR', 'GBP']
     },
+    currenciesList () {
+      return this.currencies.length ? this.currencies : this.defaultCurrencies
+    },
     authenticityToken () {
       return document.querySelector('meta[name="csrf-token"]')?.content
     },

app/models/account_config.rb

@@ -29,6 +29,7 @@ class AccountConfig < ApplicationRecord
   ALLOW_TYPED_SIGNATURE = 'allow_typed_signature'
   SUBMITTER_REMAILERS = 'submitter_reminders'
   FORM_COMPLETED_BUTTON_KEY = 'form_completed_button'
+  FORM_WITH_CONFETTI_KEY = 'form_with_confetti'
   ESIGNING_PREFERENCE_KEY = 'esigning_preference'
 
   DEFAULT_VALUES = {

app/views/accounts/show.html.erb

@@ -65,6 +65,12 @@
         <% end %>
       </div>
     <% end %>
+    <% if can?(:manage, current_account) && Docuseal.multitenant? && true_user == current_user %>
+      <div class="px-1 mt-8">
+        <h2 class="text-2xl font-bold mb-2">Danger Zone</h2>
+        <%= button_to button_title(title: 'Delete my account'), settings_account_path, class: 'btn btn-outline btn-error block', data: { turbo_confirm: 'Schedule account for deletion?' }, method: :delete, id: :account_delete_button %>
+      </div>
+    <% end %>
   </div>
   <div class="w-0 md:w-52"></div>
 </div>

app/views/api_settings/index.html.erb

@@ -35,20 +35,16 @@
        --header 'X-Auth-Token: <%= current_user.access_token.token %>' \
        --data-raw '{
          "template_id": <%= current_account.templates.last&.id || 1 %>,
-         "submission": [
+         "submitters": [
            {
-             "submitters": [
+             "name": "John Doe",
-               {
+             "role": "<%= current_account.templates.last ? current_account.templates.last.submitters.first['name'] : 'First Party' %>",
-                 "name": "John Doe",
+             "email": "<%= current_user.email.sub('@', '+test@') %>",
-                 "role": "<%= current_account.templates.last ? current_account.templates.last.submitters.first['name'] : 'First Party' %>",
+             "values": {
-                 "email": "<%= current_user.email.sub('@', '+test@') %>",
+               "Form Text Field Name": "Default Value"
-                 "values": {
+             }
-                   "Form Text Field Name": "Default Value"
+           },
-                 }
+           { "role": "Second Submitter", "email": "<%= current_user.email.sub('@', '+test2@') %>" }
-               },
-               { "role": "Second Submitter", "email": "<%= current_user.email.sub('@', '+test2@') %>" }
-             ]
-           }
          ]
        }'<% end.to_str %>
             <span class="top-0 right-0 absolute">

app/views/storage_settings/_aws_form.html.erb

@@ -25,7 +25,7 @@
       <%= fff.label :endpoint, 'Endpoint (optional)', class: 'label' %>
       <%= fff.text_field :endpoint, value: configs['endpoint'], type: :url, class: 'base-input' %>
       <label class="label">
-        <span class="label-text-alt">For AWS S3 compantiable APIs like Minio.</span>
+        <span class="label-text-alt">For AWS S3 compatible APIs like Minio.</span>
       </label>
     </div>
   <% end %>

app/views/submit_form/_submission_form.html.erb

@@ -1,4 +1,4 @@
 <% data_attachments = attachments_index.values.select { |e| e.record_id == submitter.id }.to_json(only: %i[uuid], 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 %>
 <% configs = Submitters::FormConfigs.call(submitter) %>
-<submission-form data-is-demo="<%= Docuseal.demo? %>" data-completed-redirect-url="<%= submitter.preferences['completed_redirect_url'] %>" data-completed-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.opened_at? %>" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(Struct.new(:id).new(@submitter.submission.template.account_id)) %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>"></submission-form>
+<submission-form data-is-demo="<%= Docuseal.demo? %>" data-with-confetti="<%= configs[:with_confetti] %>" data-completed-redirect-url="<%= submitter.preferences['completed_redirect_url'] %>" data-completed-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.opened_at? %>" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(Struct.new(:id).new(@submitter.submission.template.account_id)) %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>"></submission-form>

app/views/submit_form/completed.html.erb

@@ -36,7 +36,7 @@
         </span>
       </download-button>
     </div>
-    <% if @submitter.submission.template.submitters.size == 1 %>
+    <% if @submitter.submission.template.submitters.size == 1 && %w[api embed].exclude?(@submitter.submission.source) %>
       <div class="divider uppercase"><%= t('or') %></div>
       <div>
         <%= 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, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>

config/application.rb

@@ -22,7 +22,7 @@ module DocuSeal
 
     config.active_storage.routes_prefix = ''
 
-    config.i18n.available_locales = %i[en en-US en-GB es-ES fr-FR pt-PT de-DE es it de fr pl uk cs pt he]
+    config.i18n.available_locales = %i[en en-US en-GB es-ES fr-FR pt-PT de-DE es it de fr pl uk cs pt he nl]
     config.i18n.fallbacks = [:en]
 
     config.exceptions_app = ->(env) { ErrorsController.action(:show).call(env) }

config/locales/en.yml

@@ -20,7 +20,6 @@ en: &en
   completed_successfully: Completed Successfully
 
 es: &es
-  digitally_signed_by: Firmado digitalmente por
   role: Rol
   email: Correo electrónico
   digitally_signed_by: Firmado digitalmente por
@@ -42,7 +41,6 @@ es: &es
   completed_successfully: Completado exitosamente
 
 it:
-  digitally_signed_by: Signé numériquement par
   role: Rôle
   email: Email
   digitally_signed_by: Firmato digitalmente da
@@ -84,7 +82,6 @@ fr: &fr
   completed_successfully: Terminé avec succès
 
 pt: &pt
-  digitally_signed_by: Assinado digitalmente por
   role: Função
   email: Email
   digitally_signed_by: Assinado digitalmente por
@@ -106,10 +103,9 @@ pt: &pt
   completed_successfully: Concluído com sucesso
 
 de: &de
-  digitally_signed_by: Digital signiert von
   role: Rolle
   email: E-Mail
-  digitally_signed_by: Digital unterzeichnet von
+  digitally_signed_by: Digital signiert von
   role: Rolle
   provide_your_email_to_start: Gib deine E-Mail-Adresse ein, um zu starten
   start: Starten
@@ -207,6 +203,27 @@ he:
   downloading: מוריד
   completed_successfully: הושלם בהצלחה
 
+nl:
+  email: E-mail
+  digitally_signed_by: Digitaal ondertekend door
+  role: Rol
+  provide_your_email_to_start: Geef uw e-mailadres om te beginnen
+  start: Start
+  starting: Starten
+  form_has_been_deleted_by_html: 'Formulier is verwijderd door <span class="font-semibold">%{name}</span>.'
+  invited_by_html: 'Uitgenodigd door <span class="font-semibold">%{name}</span>'
+  you_have_been_invited_to_submit_a_form: U bent uitgenodigd om een formulier in te dienen
+  signed_on_time: 'Ondertekend op %{time}'
+  form_has_been_submitted_already: Formulier is al ingediend
+  send_copy_to_email: Stuur kopie naar E-mail
+  sending: Verzenden
+  resubmit: Opnieuw indienen
+  form_has_been_deleted_by_html: 'Formulier is verwijderd door <span class="font-semibold">%{name}</span>.'
+  or: of
+  download_documents: Documenten downloaden
+  downloading: Downloaden
+  completed_successfully: Succesvol voltooid
+
 en-US:
   <<: *en
   date:

config/routes.rb

@@ -116,7 +116,7 @@ Rails.application.routes.draw do
     resource :personalization, only: %i[show create], controller: 'personalization_settings'
     resources :api, only: %i[index create], controller: 'api_settings'
     resource :webhooks, only: %i[show create update], controller: 'webhook_settings'
-    resource :account, only: %i[show update]
+    resource :account, only: %i[show update destroy]
     resources :profile, only: %i[index] do
       collection do
         patch :update_contact

lib/params/base_validator.rb

@@ -36,8 +36,6 @@ module Params
       message += " in `#{@current_path}`." if @current_path.present?
 
       raise InvalidParameterError, message unless dry_run?
-
-      Rollbar.error(message) if defined?(Rollbar)
     end
 
     def required(params, keys, message: nil)
@@ -59,6 +57,14 @@ module Params
       raise_error(message || "#{key} must be a #{type}")
     end
 
+    def format(params, key, regexp, message: nil)
+      return if params.blank?
+      return if params[key].blank?
+      return if regexp.match?(params[key].to_s)
+
+      raise_error(message || "#{key} must follow the #{regexp.source} format")
+    end
+
     def in_path(params, path = [])
       old_path = @current_path
 
@@ -75,7 +81,7 @@ module Params
       old_path = @current_path
 
       params.dig(*path)&.each_with_index do |item, index|
-        @current_path = old_path + [*path].map(&:to_s).join('.') + "[#{index}]"
+        @current_path = [old_path, [*path].map(&:to_s).join('.') + "[#{index}]"].compact_blank.join('.')
 
         yield item if item
       end
@@ -102,5 +108,13 @@ module Params
 
       raise_error(message || "#{key} must be one of #{values.join(', ')}")
     end
+
+    def more_than(params, key, value, message: nil)
+      return if params.blank?
+      return if params[key].blank?
+      return if params[key].to_f > value
+
+      raise_error(message || "#{key} must be more than #{value}")
+    end
   end
 end

lib/params/submission_create_validator.rb

@@ -2,13 +2,16 @@
 
 module Params
   class SubmissionCreateValidator < BaseValidator
-    # rubocop:disable Metrics
     def call
       if params[:submission].blank? && (params[:emails].present? || params[:email].present?)
         validate_creation_from_emails(params)
+      elsif params[:submitters].present?
+        validate_creation_from_submitters(params)
       else
         validate_creation_from_submission(params)
       end
+
+      true
     end
 
     def validate_creation_from_emails(params)
@@ -25,8 +28,56 @@ module Params
 
         required(message_params, :body)
       end
+    end
 
-      true
+    def validate_creation_from_submitters(params)
+      required(params, :template_id)
+      required(params, :submitters)
+
+      boolean(params, :send_email)
+      boolean(params, :send_sms)
+      type(params, :order, String)
+      type(params, :completed_redirect_url, String)
+      type(params, :bcc_completed, String)
+      type(params, :message, Hash)
+
+      in_path(params, :message) do |message_params|
+        type(message_params, :subject, String)
+        type(message_params, :body, String)
+
+        required(message_params, :body)
+      end
+
+      value_in(params, :order, %w[preserved random], allow_nil: true)
+
+      in_path_each(params, :submitters) do |submitter_params|
+        validate_submitter(submitter_params)
+      end
+    end
+
+    def validate_submitter(submitter_params)
+      required(submitter_params, %i[email phone name])
+
+      type(submitter_params, :name, String)
+      type(submitter_params, :email, String)
+      format(submitter_params, :email, /@/, message: 'email is invalid')
+      type(submitter_params, :phone, String)
+      format(submitter_params, :phone, /\A\+\d+\z/,
+             message: 'phone should start with +<country code> and contain only digits')
+      type(submitter_params, :values, Hash)
+      boolean(submitter_params, :send_email)
+      boolean(submitter_params, :send_sms)
+      type(submitter_params, :completed_redirect_url, String)
+      type(submitter_params, :fields, Array)
+
+      in_path_each(submitter_params, :fields) do |field_params|
+        required(field_params, :name)
+
+        type(field_params, :name, String)
+        type(field_params, :validation_pattern, String)
+        type(field_params, :invalid_message, String)
+        boolean(field_params, :readonly)
+      end
     end
 
     def validate_creation_from_submission(params)
@@ -56,30 +107,8 @@ module Params
       end
 
       in_path_each(params, %i[submission submitters]) do |submitter_params|
-        required(submitter_params, %i[email phone name])
+        validate_submitter(submitter_params)
-
-        type(submitter_params, :name, String)
-        type(submitter_params, :email, String)
-        type(submitter_params, :phone, String)
-        type(submitter_params, :values, Hash)
-        boolean(submitter_params, :send_email)
-        boolean(submitter_params, :send_sms)
-        type(submitter_params, :completed_redirect_url, String)
-        type(submitter_params, :fields, Array)
-
-        in_path_each(submitter_params, %i[fields]) do |field_params|
-          required(field_params, :name)
-
-          type(field_params, :name, String)
-          type(field_params, :default_value, String)
-          type(field_params, :validation_pattern, String)
-          type(field_params, :invalid_message, String)
-          boolean(field_params, :readonly)
-        end
       end
-
-      true
     end
-    # rubocop:enable Metrics
   end
 end

lib/submissions/create_from_submitters.rb

@@ -39,11 +39,11 @@ module Submissions
       end
     end
 
-    def maybe_set_template_fields(submission, submitters_attrs, submitter_uuid: nil)
+    def maybe_set_template_fields(submission, submitters_attrs, default_submitter_uuid: nil)
       template_fields = (submission.template_fields || submission.template.fields).deep_dup
 
       submitters_attrs.each_with_index do |submitter_attrs, index|
-        submitter_uuid ||= find_submitter_uuid(submission.template, submitter_attrs, index)
+        submitter_uuid = default_submitter_uuid || find_submitter_uuid(submission.template, submitter_attrs, index)
 
         process_readonly_fields_param(submitter_attrs[:readonly_fields], template_fields, submitter_uuid)
         process_field_values_param(submitter_attrs[:values], template_fields, submitter_uuid)

lib/submissions/generate_audit_trail.rb

@@ -69,7 +69,7 @@ module Submissions
       composer.column(columns: 1) do |column|
         add_logo(column, submission)
 
-        column.text('Audit Log',
+        column.text(account.linked_account_account&.testing? ? 'Testing Log - Not for Production Use' : 'Audit Log',
                     font_size: 16,
                     padding: [15, 0, 0, 0],
                     position: :float, position_hint: :right)

lib/submitters/form_configs.rb

@@ -7,13 +7,15 @@ module Submitters
     def call(submitter)
       configs = submitter.submission.template.account.account_configs
                          .where(key: [AccountConfig::FORM_COMPLETED_BUTTON_KEY,
+                                      AccountConfig::FORM_WITH_CONFETTI_KEY,
                                       AccountConfig::ALLOW_TYPED_SIGNATURE])
 
       completed_button = configs.find { |e| e.key == AccountConfig::FORM_COMPLETED_BUTTON_KEY }&.value || {}
 
       with_typed_signature = configs.find { |e| e.key == AccountConfig::ALLOW_TYPED_SIGNATURE }&.value != false
+      with_confetti = configs.find { |e| e.key == AccountConfig::FORM_WITH_CONFETTI_KEY }&.value != false
 
-      { completed_button:, with_typed_signature: }
+      { completed_button:, with_typed_signature:, with_confetti: }
     end
   end
 end

lib/submitters/normalize_values.rb

@@ -19,14 +19,16 @@ module Submitters
 
       normalized_values = values.to_h.filter_map do |key, value|
         if fields_uuid_index[key].blank?
-          key = fields_name_index[key]&.dig('uuid')
+          original_key = key
 
-          raise(UnknownFieldName, "Unknown field: #{key}") if key.blank? && throw_errors
+          key = fields_name_index[key]&.dig('uuid') || fields_name_index[key.to_s.downcase]&.dig('uuid')
+
+          raise(UnknownFieldName, "Unknown field: #{original_key}") if key.blank? && throw_errors
         end
 
         next if key.blank?
 
-        if fields_uuid_index[key]['type'].in?(%w[initials signature image file])
+        if fields_uuid_index[key]['type'].in?(%w[initials signature image file]) && value.present?
           new_value, new_attachments = normalize_attachment_value(value, template.account, for_submitter)
 
           attachments.push(*new_attachments)
@@ -59,7 +61,9 @@ module Submitters
     end
 
     def build_fields_index(fields)
-      fields.index_by { |e| e['name'] }.merge(fields.index_by { |e| e['name'].to_s.parameterize.underscore })
+      fields.index_by { |e| e['name'] }
+            .merge(fields.index_by { |e| e['name'].to_s.parameterize.underscore })
+            .merge(fields.index_by { |e| e['name'].to_s.downcase })
     end
 
     def normalize_attachment_value(value, account, for_submitter = nil)