mirror of
https://github.com/docusealco/docuseal
synced 2026-11-06 15:02:33 -05:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
55d9511c01 | ||
|
|
929d29576d | ||
|
|
6f7128a51c | ||
|
|
fc5c4ff2fc | ||
|
|
a81595db2b | ||
|
|
a5615d500d | ||
|
|
da9266befc | ||
|
|
5b3cffeb73 | ||
|
|
8f7b8a5fdf |
No files matched your search
+13
@@ -37,11 +37,24 @@ FROM ruby:3.3.1-alpine3.18 as app
|
||||
ENV RAILS_ENV=production
|
||||
ENV BUNDLE_WITHOUT="development:test"
|
||||
ENV LD_PRELOAD=/lib/libgcompat.so.0
|
||||
ENV OPENSSL_CONF=/app/openssl_legacy.cnf
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
RUN apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils vips-heif gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
|
||||
|
||||
RUN echo $'.include = /etc/ssl/openssl.cnf\n\
|
||||
\n\
|
||||
[provider_sect]\n\
|
||||
default = default_sect\n\
|
||||
legacy = legacy_sect\n\
|
||||
\n\
|
||||
[default_sect]\n\
|
||||
activate = 1\n\
|
||||
\n\
|
||||
[legacy_sect]\n\
|
||||
activate = 1' >> /app/openssl_legacy.cnf
|
||||
|
||||
COPY ./Gemfile ./Gemfile.lock ./
|
||||
|
||||
RUN apk add --no-cache build-base && bundle install && apk del build-base && rm -rf ~/.bundle /usr/local/bundle/cache && ruby -e "puts Dir['/usr/local/bundle/**/{spec,rdoc,resources/shared,resources/collation,resources/locales}']" | xargs rm -rf
|
||||
|
||||
@@ -20,6 +20,8 @@ module Api
|
||||
|
||||
Templates::CloneAttachments.call(template: cloned_template, original_template: @template)
|
||||
|
||||
SendTemplateCreatedWebhookRequestJob.perform_later(cloned_template)
|
||||
|
||||
render json: Templates::SerializeForApi.call(cloned_template)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -65,6 +65,8 @@ module Api
|
||||
|
||||
@template.update!(template_params)
|
||||
|
||||
SendTemplateUpdatedWebhookRequestJob.perform_later(@template)
|
||||
|
||||
render json: @template.as_json(only: %i[id updated_at])
|
||||
end
|
||||
|
||||
|
||||
@@ -57,8 +57,8 @@ class EsignSettingsController < ApplicationController
|
||||
save_new_cert!(@encrypted_config, @cert_record)
|
||||
|
||||
redirect_to settings_esign_path, notice: 'Certificate has been successfully added!'
|
||||
rescue OpenSSL::PKCS12::PKCS12Error
|
||||
@cert_record.errors.add(:password, "is invalid. Make sure you're uploading a valid .p12 file")
|
||||
rescue OpenSSL::PKCS12::PKCS12Error => e
|
||||
@cert_record.errors.add(:password, e.message)
|
||||
|
||||
render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'), status: :unprocessable_entity
|
||||
end
|
||||
|
||||
@@ -61,6 +61,8 @@ class TemplatesController < ApplicationController
|
||||
if @template.save
|
||||
Templates::CloneAttachments.call(template: @template, original_template: @base_template) if @base_template
|
||||
|
||||
SendTemplateUpdatedWebhookRequestJob.perform_later(@template)
|
||||
|
||||
maybe_redirect_to_template(@template)
|
||||
else
|
||||
render turbo_stream: turbo_stream.replace(:modal, template: 'templates/new'), status: :unprocessable_entity
|
||||
@@ -70,6 +72,8 @@ class TemplatesController < ApplicationController
|
||||
def update
|
||||
@template.update!(template_params)
|
||||
|
||||
SendTemplateUpdatedWebhookRequestJob.perform_later(@template)
|
||||
|
||||
head :ok
|
||||
end
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@ class TemplatesUploadsController < ApplicationController
|
||||
|
||||
@template.update!(schema:)
|
||||
|
||||
SendTemplateCreatedWebhookRequestJob.perform_later(@template)
|
||||
|
||||
redirect_to edit_template_path(@template)
|
||||
rescue Templates::CreateAttachments::PdfEncrypted
|
||||
render turbo_stream: turbo_stream.append(params[:form_id], html: helpers.tag.prompt_password)
|
||||
|
||||
@@ -5,6 +5,8 @@ class WebhookPreferencesController < ApplicationController
|
||||
form.viewed
|
||||
form.started
|
||||
form.completed
|
||||
template.created
|
||||
template.updated
|
||||
submission.archived
|
||||
].freeze
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ window.customElements.define('submission-form', class extends HTMLElement {
|
||||
isDemo: this.dataset.isDemo === 'true',
|
||||
attribution: this.dataset.attribution !== 'false',
|
||||
withConfetti: this.dataset.withConfetti !== 'false',
|
||||
withDisclosure: this.dataset.withDisclosure === 'true',
|
||||
withTypedSignature: this.dataset.withTypedSignature !== 'false',
|
||||
authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
|
||||
values: reactive(JSON.parse(this.dataset.values)),
|
||||
|
||||
@@ -165,6 +165,9 @@
|
||||
<span v-else-if="field.type === 'date'">
|
||||
{{ formattedDate }}
|
||||
</span>
|
||||
<span v-else-if="field.type === 'number'">
|
||||
{{ formatNumber(modelValue, field.preferences?.format) }}
|
||||
</span>
|
||||
<span
|
||||
v-else
|
||||
class="whitespace-pre-wrap"
|
||||
@@ -373,6 +376,17 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
formatNumber (number, format) {
|
||||
if (format === 'comma') {
|
||||
return new Intl.NumberFormat('en-US').format(number)
|
||||
} else if (format === 'dot') {
|
||||
return new Intl.NumberFormat('de-DE').format(number)
|
||||
} else if (format === 'space') {
|
||||
return new Intl.NumberFormat('fr-FR').format(number)
|
||||
} else {
|
||||
return number
|
||||
}
|
||||
},
|
||||
formatDate (date, format) {
|
||||
const monthFormats = {
|
||||
M: 'numeric',
|
||||
@@ -388,6 +402,7 @@ export default {
|
||||
|
||||
const yearFormats = {
|
||||
YYYY: 'numeric',
|
||||
YYY: 'numeric',
|
||||
YY: '2-digit'
|
||||
}
|
||||
|
||||
|
||||
@@ -324,6 +324,8 @@
|
||||
:previous-value="previousSignatureValueFor(currentField)"
|
||||
:with-typed-signature="withTypedSignature"
|
||||
:attachments-index="attachmentsIndex"
|
||||
:button-text="buttonText"
|
||||
:with-disclosure="withDisclosure"
|
||||
:submitter-slug="submitterSlug"
|
||||
:show-field-names="showFieldNames"
|
||||
@attached="attachments.push($event)"
|
||||
@@ -382,7 +384,7 @@
|
||||
</div>
|
||||
<div
|
||||
v-if="currentField.type !== 'payment' || submittedValues[currentField.uuid]"
|
||||
class="mt-6 md:mt-8"
|
||||
:class="withDisclosure && currentField.type === 'signature' ? 'mt-2' : 'mt-6 md:mt-8'"
|
||||
>
|
||||
<button
|
||||
id="submit_form_button"
|
||||
@@ -396,11 +398,8 @@
|
||||
v-if="isSubmitting"
|
||||
class="mr-1 animate-spin"
|
||||
/>
|
||||
<span v-if="alwaysMinimize || stepFields.length === currentStep + 1">
|
||||
{{ t('submit') }}
|
||||
</span>
|
||||
<span v-else>
|
||||
{{ t('next') }}
|
||||
{{ buttonText }}
|
||||
</span><span
|
||||
v-if="isSubmitting"
|
||||
class="w-6 flex justify-start mr-1"
|
||||
@@ -554,6 +553,11 @@ export default {
|
||||
required: false,
|
||||
default: false
|
||||
},
|
||||
withDisclosure: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: false
|
||||
},
|
||||
reuseSignature: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
@@ -682,11 +686,18 @@ export default {
|
||||
isMobile () {
|
||||
return /android|iphone|ipad/i.test(navigator.userAgent)
|
||||
},
|
||||
buttonText () {
|
||||
if (this.alwaysMinimize || this.stepFields.length === this.currentStep + 1) {
|
||||
return this.t('submit')
|
||||
} else {
|
||||
return this.t('next')
|
||||
}
|
||||
},
|
||||
alwaysMinimize () {
|
||||
return this.minimize || (this.orientation?.includes('landscape') && this.isMobile && parseInt(window.innerHeight) < 550)
|
||||
},
|
||||
currentStepFields () {
|
||||
return this.stepFields[this.currentStep]
|
||||
return this.stepFields[this.currentStep] || []
|
||||
},
|
||||
browserLanguage () {
|
||||
return (navigator.language || navigator.userLanguage || 'en').split('-')[0]
|
||||
@@ -763,7 +774,7 @@ export default {
|
||||
this.isFormVisible = value
|
||||
},
|
||||
currentStepFields (value) {
|
||||
if (!value) {
|
||||
if (isEmpty(value)) {
|
||||
this.currentStep -= 1
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
const en = {
|
||||
text: 'Text',
|
||||
by_clicking_you_agree_to_the: 'By clicking "{button}", you agree to the',
|
||||
electronic_signature_disclosure: 'Electronic Signature Disclosure',
|
||||
esignature_disclosure: 'eSignature Disclosure',
|
||||
signature: 'Signature',
|
||||
initials: 'Initials',
|
||||
date: 'Date',
|
||||
@@ -65,6 +68,9 @@ const en = {
|
||||
}
|
||||
|
||||
const es = {
|
||||
by_clicking_you_agree_to_the: 'Al hacer clic en "{button}", usted acepta el',
|
||||
electronic_signature_disclosure: 'Divulgación de Firma Electrónica',
|
||||
esignature_disclosure: 'Divulgación de eFirma',
|
||||
minimize: 'Minimizar',
|
||||
text: 'Texto',
|
||||
signature: 'Firma',
|
||||
@@ -130,6 +136,9 @@ const es = {
|
||||
}
|
||||
|
||||
const it = {
|
||||
by_clicking_you_agree_to_the: 'Cliccando su "{button}", accetti il',
|
||||
electronic_signature_disclosure: 'Divulgazione della Firma Elettronica',
|
||||
esignature_disclosure: 'Divulgazione della eFirma',
|
||||
minimize: 'Minimizza',
|
||||
text: 'Testo',
|
||||
signature: 'Firma',
|
||||
@@ -195,6 +204,9 @@ const it = {
|
||||
}
|
||||
|
||||
const de = {
|
||||
by_clicking_you_agree_to_the: 'Durch Klicken auf "{button}" stimmen Sie zu, dass Sie die',
|
||||
electronic_signature_disclosure: 'Elektronische Unterschriftenoffenlegung',
|
||||
esignature_disclosure: 'eSignatur Offenlegung',
|
||||
minimize: 'Minimieren',
|
||||
text: 'Text',
|
||||
signature: 'Unterschrift',
|
||||
@@ -260,6 +272,9 @@ const de = {
|
||||
}
|
||||
|
||||
const fr = {
|
||||
by_clicking_you_agree_to_the: 'En cliquant sur "{button}", vous acceptez la',
|
||||
electronic_signature_disclosure: 'Divulgation de Signature Électronique',
|
||||
esignature_disclosure: 'Divulgation de la eSignature',
|
||||
minimize: 'Réduire',
|
||||
text: 'Texte',
|
||||
signature: 'Signature',
|
||||
@@ -325,6 +340,9 @@ const fr = {
|
||||
}
|
||||
|
||||
const pl = {
|
||||
by_clicking_you_agree_to_the: 'Klikając na "{button}", zgadzasz się na',
|
||||
electronic_signature_disclosure: 'Ujawnienie Elektronicznej Sygnatury',
|
||||
esignature_disclosure: 'Ujawnienie ePodpisu',
|
||||
minimize: 'Zminimalizuj',
|
||||
text: 'Tekst',
|
||||
signature: 'Podpis',
|
||||
@@ -390,6 +408,9 @@ const pl = {
|
||||
}
|
||||
|
||||
const uk = {
|
||||
by_clicking_you_agree_to_the: 'Натиснувши на "{button}", ви погоджуєтеся з',
|
||||
electronic_signature_disclosure: 'Розголошення Електронного Підпису',
|
||||
esignature_disclosure: 'Розголошення еПідпису',
|
||||
minimize: 'Зменшити',
|
||||
text: 'Текст',
|
||||
signature: 'Підпис',
|
||||
@@ -455,6 +476,9 @@ const uk = {
|
||||
}
|
||||
|
||||
const cs = {
|
||||
by_clicking_you_agree_to_the: 'Kliknutím na "{button}" souhlasíte s',
|
||||
electronic_signature_disclosure: 'Zveřejněním Elektronického Podpisu',
|
||||
esignature_disclosure: 'Zveřejnění ePodpisu',
|
||||
minimize: 'Minimalizovat',
|
||||
text: 'Text',
|
||||
signature: 'Podpis',
|
||||
@@ -520,6 +544,9 @@ const cs = {
|
||||
}
|
||||
|
||||
const pt = {
|
||||
by_clicking_you_agree_to_the: 'Ao clicar em "{button}", você concorda com o',
|
||||
electronic_signature_disclosure: 'Divulgação de Assinatura Eletrônica',
|
||||
esignature_disclosure: 'Divulgação da eAssinatura',
|
||||
minimize: 'Minimizar',
|
||||
text: 'Texto',
|
||||
signature: 'Assinatura',
|
||||
@@ -585,6 +612,9 @@ const pt = {
|
||||
}
|
||||
|
||||
const he = {
|
||||
by_clicking_you_agree_to_the: 'על ידי לחיצה על "{button}", אתה מסכים ל',
|
||||
electronic_signature_disclosure: 'חשיפת חתימה אלקטרונית',
|
||||
esignature_disclosure: 'חשיפת ה-eחתימה',
|
||||
minimize: 'לקטן',
|
||||
text: 'טקסט',
|
||||
signature: 'חתימה',
|
||||
@@ -651,6 +681,9 @@ const he = {
|
||||
}
|
||||
|
||||
const nl = {
|
||||
by_clicking_you_agree_to_the: 'Door op "{button}" te klikken, gaat u akkoord met de',
|
||||
electronic_signature_disclosure: 'Openbaarmaking van Elektronische Handtekening',
|
||||
esignature_disclosure: 'Openbaarmaking van eHandtekening',
|
||||
minimize: 'Minimaliseren',
|
||||
text: 'Tekst',
|
||||
signature: 'Handtekening',
|
||||
@@ -717,6 +750,9 @@ const nl = {
|
||||
}
|
||||
|
||||
const ar = {
|
||||
by_clicking_you_agree_to_the: 'بالنقر فوق "{button}"، أنت توافق على',
|
||||
electronic_signature_disclosure: 'كشف التوقيع الإلكتروني',
|
||||
esignature_disclosure: 'كشف التوقيع الإلكتروني',
|
||||
text: 'نص',
|
||||
signature: 'توقيع',
|
||||
initials: 'الاختصارات',
|
||||
@@ -783,6 +819,9 @@ const ar = {
|
||||
}
|
||||
|
||||
const ko = {
|
||||
by_clicking_you_agree_to_the: '"{button}"를 클릭함으로써, 다음에 동의하게 됩니다',
|
||||
electronic_signature_disclosure: '전자 서명 공개',
|
||||
esignature_disclosure: '전자 서명 공개',
|
||||
text: '텍스트',
|
||||
signature: '서명',
|
||||
initials: '이니셜',
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
<template>
|
||||
<div dir="auto">
|
||||
<div
|
||||
dir="auto"
|
||||
class="relative"
|
||||
>
|
||||
<div
|
||||
class="flex justify-between items-center w-full"
|
||||
:class="{ 'mb-2': !field.description }"
|
||||
@@ -136,6 +139,23 @@
|
||||
type="text"
|
||||
@input="updateWrittenSignature"
|
||||
>
|
||||
<div
|
||||
v-if="withDisclosure"
|
||||
dir="auto"
|
||||
class="text-base-content/60 text-xs text-center w-full mt-1"
|
||||
>
|
||||
{{ t('by_clicking_you_agree_to_the').replace('{button}', buttonText.charAt(0).toUpperCase() + buttonText.slice(1)) }} <a
|
||||
href="https://www.docuseal.co/esign-disclosure"
|
||||
target="_blank"
|
||||
>
|
||||
<span class="inline md:hidden">
|
||||
{{ t('esignature_disclosure') }}
|
||||
</span>
|
||||
<span class="hidden md:inline">
|
||||
{{ t('electronic_signature_disclosure') }}
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -176,6 +196,16 @@ export default {
|
||||
required: false,
|
||||
default: true
|
||||
},
|
||||
withDisclosure: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: false
|
||||
},
|
||||
buttonText: {
|
||||
type: String,
|
||||
required: false,
|
||||
default: 'Submit'
|
||||
},
|
||||
withTypedSignature: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
|
||||
@@ -161,6 +161,10 @@
|
||||
class="aspect-square mx-auto"
|
||||
:class="{ '!w-auto !h-full': area.w > area.h, '!w-full !h-auto': area.w <= area.h }"
|
||||
/>
|
||||
<span
|
||||
v-else-if="field.type === 'number'"
|
||||
class="whitespace-pre-wrap"
|
||||
>{{ formatNumber(field.default_value, field.preferences?.format) }}</span>
|
||||
<span
|
||||
v-else
|
||||
class="whitespace-pre-wrap"
|
||||
@@ -417,6 +421,17 @@ export default {
|
||||
closeDropdown () {
|
||||
document.activeElement.blur()
|
||||
},
|
||||
formatNumber (number, format) {
|
||||
if (format === 'comma') {
|
||||
return new Intl.NumberFormat('en-US').format(number)
|
||||
} else if (format === 'dot') {
|
||||
return new Intl.NumberFormat('de-DE').format(number)
|
||||
} else if (format === 'space') {
|
||||
return new Intl.NumberFormat('fr-FR').format(number)
|
||||
} else {
|
||||
return number
|
||||
}
|
||||
},
|
||||
maybeBlurSettings (e) {
|
||||
if (!e.relatedTarget || !this.$refs.settingsDropdown.contains(e.relatedTarget)) {
|
||||
this.isSettingsFocus = false
|
||||
|
||||
@@ -1,4 +1,31 @@
|
||||
<template>
|
||||
<div
|
||||
v-if="field.type === 'number'"
|
||||
class="py-1.5 px-1 relative"
|
||||
@click.stop
|
||||
>
|
||||
<select
|
||||
:placeholder="t('format')"
|
||||
class="select select-bordered select-xs font-normal w-full max-w-xs !h-7 !outline-0 bg-transparent"
|
||||
@change="[field.preferences ||= {}, field.preferences.format = $event.target.value, save()]"
|
||||
>
|
||||
<option
|
||||
v-for="format in numberFormats"
|
||||
:key="format"
|
||||
:value="format"
|
||||
:selected="format === field.preferences?.format || (format === 'none' && !field.preferences?.format)"
|
||||
>
|
||||
{{ formatNumber(123456789.567, format) }}
|
||||
</option>
|
||||
</select>
|
||||
<label
|
||||
:style="{ backgroundColor }"
|
||||
class="absolute -top-1 left-2.5 px-1 h-4"
|
||||
style="font-size: 8px"
|
||||
>
|
||||
{{ t('format') }}
|
||||
</label>
|
||||
</div>
|
||||
<div
|
||||
v-if="['number'].includes(field.type)"
|
||||
class="py-1.5 px-1 relative"
|
||||
@@ -335,6 +362,14 @@ export default {
|
||||
return acc
|
||||
}, {})
|
||||
},
|
||||
numberFormats () {
|
||||
return [
|
||||
'none',
|
||||
'comma',
|
||||
'dot',
|
||||
'space'
|
||||
]
|
||||
},
|
||||
dateFormats () {
|
||||
const formats = [
|
||||
'MM/DD/YYYY',
|
||||
@@ -382,6 +417,17 @@ export default {
|
||||
|
||||
this.save()
|
||||
},
|
||||
formatNumber (number, format) {
|
||||
if (format === 'comma') {
|
||||
return new Intl.NumberFormat('en-US').format(number)
|
||||
} else if (format === 'dot') {
|
||||
return new Intl.NumberFormat('de-DE').format(number)
|
||||
} else if (format === 'space') {
|
||||
return new Intl.NumberFormat('fr-FR').format(number)
|
||||
} else {
|
||||
return number
|
||||
}
|
||||
},
|
||||
formatDate (date, format) {
|
||||
const monthFormats = {
|
||||
M: 'numeric',
|
||||
|
||||
@@ -29,9 +29,9 @@ class SendSubmissionArchivedWebhookRequestJob < ApplicationJob
|
||||
end
|
||||
|
||||
if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
|
||||
(!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
|
||||
(!Docuseal.multitenant? || submission.account.account_configs.exists?(key: :plan))
|
||||
SendSubmissionArchivedWebhookRequestJob.set(wait: (2**attempt).minutes)
|
||||
.perform_later(submitter, {
|
||||
.perform_later(submission, {
|
||||
attempt: attempt + 1,
|
||||
last_status: resp&.status.to_i
|
||||
})
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class SendTemplateCreatedWebhookRequestJob < ApplicationJob
|
||||
USER_AGENT = 'DocuSeal.co Webhook'
|
||||
|
||||
MAX_ATTEMPTS = 10
|
||||
|
||||
def perform(template, params = {})
|
||||
attempt = params[:attempt].to_i
|
||||
url = Accounts.load_webhook_url(template.account)
|
||||
|
||||
return if url.blank?
|
||||
|
||||
preferences = Accounts.load_webhook_preferences(template.account)
|
||||
|
||||
return if preferences['template.created'].blank?
|
||||
|
||||
resp = begin
|
||||
Faraday.post(url,
|
||||
{
|
||||
event_type: 'template.created',
|
||||
timestamp: Time.current,
|
||||
data: Templates::SerializeForApi.call(template)
|
||||
}.to_json,
|
||||
'Content-Type' => 'application/json',
|
||||
'User-Agent' => USER_AGENT)
|
||||
rescue Faraday::Error
|
||||
nil
|
||||
end
|
||||
|
||||
if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
|
||||
(!Docuseal.multitenant? || template.account.account_configs.exists?(key: :plan))
|
||||
SendTemplateCreatedWebhookRequestJob.set(wait: (2**attempt).minutes)
|
||||
.perform_later(template, {
|
||||
attempt: attempt + 1,
|
||||
last_status: resp&.status.to_i
|
||||
})
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,40 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class SendTemplateUpdatedWebhookRequestJob < ApplicationJob
|
||||
USER_AGENT = 'DocuSeal.co Webhook'
|
||||
|
||||
MAX_ATTEMPTS = 10
|
||||
|
||||
def perform(template, params = {})
|
||||
attempt = params[:attempt].to_i
|
||||
url = Accounts.load_webhook_url(template.account)
|
||||
|
||||
return if url.blank?
|
||||
|
||||
preferences = Accounts.load_webhook_preferences(template.account)
|
||||
|
||||
return if preferences['template.updated'].blank?
|
||||
|
||||
resp = begin
|
||||
Faraday.post(url,
|
||||
{
|
||||
event_type: 'template.updated',
|
||||
timestamp: Time.current,
|
||||
data: Templates::SerializeForApi.call(template)
|
||||
}.to_json,
|
||||
'Content-Type' => 'application/json',
|
||||
'User-Agent' => USER_AGENT)
|
||||
rescue Faraday::Error
|
||||
nil
|
||||
end
|
||||
|
||||
if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
|
||||
(!Docuseal.multitenant? || template.account.account_configs.exists?(key: :plan))
|
||||
SendTemplateUpdatedWebhookRequestJob.set(wait: (2**attempt).minutes)
|
||||
.perform_later(template, {
|
||||
attempt: attempt + 1,
|
||||
last_status: resp&.status.to_i
|
||||
})
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -2,23 +2,24 @@
|
||||
<%= f.hidden_field :key %>
|
||||
<div class="form-control">
|
||||
<% record = Struct.new(:first_duration, :second_duration, :third_duration).new(*(f.object.value || {}).values_at('first_duration', 'second_duration', 'third_duration')) %>
|
||||
<% durations = Docuseal.multitenant? ? AccountConfigs::REMINDER_DURATIONS.except('one_hour', 'two_hours').invert : AccountConfigs::REMINDER_DURATIONS.invert %>
|
||||
<div class="flex flex-col md:flex-row gap-4">
|
||||
<div class="w-full">
|
||||
<%= f.fields_for :value, record do |ff| %>
|
||||
<%= ff.label :first_duration, 'First reminder in', class: 'label' %>
|
||||
<%= ff.select :first_duration, AccountConfigs::REMINDER_DURATIONS.invert, { include_blank: 'None' }, class: 'base-select' %>
|
||||
<%= ff.select :first_duration, durations, { include_blank: 'None' }, class: 'base-select' %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="w-full">
|
||||
<%= f.fields_for :value, record do |ff| %>
|
||||
<%= ff.label :second_duration, 'Second reminder in', class: 'label' %>
|
||||
<%= ff.select :second_duration, AccountConfigs::REMINDER_DURATIONS.invert, { include_blank: 'None' }, class: 'base-select' %>
|
||||
<%= ff.select :second_duration, durations, { include_blank: 'None' }, class: 'base-select' %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="w-full">
|
||||
<%= f.fields_for :value, record do |ff| %>
|
||||
<%= ff.label :third_duration, 'Third reminder in', class: 'label' %>
|
||||
<%= ff.select :third_duration, AccountConfigs::REMINDER_DURATIONS.invert, { include_blank: 'None' }, class: 'base-select' %>
|
||||
<%= ff.select :third_duration, durations, { include_blank: 'None' }, class: 'base-select' %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -39,6 +39,11 @@
|
||||
<% value = Time.current.in_time_zone(local_assigns[:timezone]).to_date.to_s if value == '{{date}}' %>
|
||||
<%= TimeUtils.format_date_string(value, field.dig('preferences', 'format'), local_assigns[:locale]) %>
|
||||
</div>
|
||||
<% elsif field['type'] == 'number' %>
|
||||
<autosize-field></autosize-field>
|
||||
<div class="flex items-center px-0.5 whitespace-nowrap">
|
||||
<%= NumberUtils.format_number(value, field.dig('preferences', 'format')) %>
|
||||
</div>
|
||||
<% else %>
|
||||
<autosize-field></autosize-field>
|
||||
<div class="flex items-center px-0.5 whitespace-pre-wrap"><%= Array.wrap(value).join(', ') %></div>
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module NumberUtils
|
||||
FORMAT_LOCALES = {
|
||||
'dot' => 'de',
|
||||
'space' => 'fr',
|
||||
'comma' => 'en'
|
||||
}.freeze
|
||||
|
||||
module_function
|
||||
|
||||
def format_number(number, format)
|
||||
locale = FORMAT_LOCALES[format]
|
||||
|
||||
if locale
|
||||
ApplicationController.helpers.number_with_delimiter(number, locale:)
|
||||
else
|
||||
number
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -261,6 +261,8 @@ module Submissions
|
||||
value = TimeUtils.format_date_string(value, field.dig('preferences', 'format'), account.locale)
|
||||
end
|
||||
|
||||
value = NumberUtils.format_number(value, field.dig('preferences', 'format')) if field['type'] == 'number'
|
||||
|
||||
value = value.join(', ') if value.is_a?(Array)
|
||||
|
||||
composer.formatted_text_box([{ text: TextUtils.maybe_rtl_reverse(value.to_s.presence || 'n/a') }],
|
||||
|
||||
@@ -213,6 +213,8 @@ module Submissions
|
||||
value = TimeUtils.format_date_string(value, field.dig('preferences', 'format'), account.locale)
|
||||
end
|
||||
|
||||
value = NumberUtils.format_number(value, field.dig('preferences', 'format')) if field['type'] == 'number'
|
||||
|
||||
value = TextUtils.maybe_rtl_reverse(Array.wrap(value).join(', '))
|
||||
|
||||
text = HexaPDF::Layout::TextFragment.create(value, font: pdf.fonts.add(FONT_NAME),
|
||||
@@ -344,7 +346,7 @@ module Submissions
|
||||
|
||||
if tsa_url
|
||||
params[:timestamp_handler] = Submissions::TimestampHandler.new(tsa_url:)
|
||||
params[:signature_size] = 10_000
|
||||
params[:signature_size] = 20_000
|
||||
end
|
||||
|
||||
params
|
||||
|
||||
@@ -15,6 +15,7 @@ module TimeUtils
|
||||
|
||||
YEAR_FORMATS = {
|
||||
'YYYY' => '%Y',
|
||||
'YYY' => '%Y',
|
||||
'YY' => '%y'
|
||||
}.freeze
|
||||
|
||||
|
||||
Reference in new issue
Block a user