download multiple files on safari ios

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.2.2-alpine as webpack
+FROM ruby:3.2.2-alpine3.18 as webpack
 
 ENV RAILS_ENV=production
 ENV NODE_ENV=production
@@ -24,7 +24,7 @@ COPY ./app/views ./app/views
 
 RUN echo "gem 'shakapacker'" > Gemfile && ./bin/shakapacker
 
-FROM ruby:3.2.2-alpine as app
+FROM ruby:3.2.2-alpine3.18 as app
 
 ENV RAILS_ENV=production
 ENV BUNDLE_WITHOUT="development:test"

Gemfile

@@ -21,15 +21,12 @@ gem 'jwt'
 gem 'lograge'
 gem 'mysql2', require: false
 gem 'oj'
-gem 'omniauth-github'
-gem 'omniauth-google-oauth2'
-gem 'omniauth-microsoft-office365'
-gem 'omniauth-rails_csrf_protection'
 gem 'pagy'
 gem 'pdf-reader'
 gem 'pg', require: false
 gem 'premailer-rails'
 gem 'puma'
+gem 'rack'
 gem 'rails'
 gem 'rails_autolink'
 gem 'rails-i18n'

Gemfile.lock

@@ -2,93 +2,102 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    actioncable (7.0.7)
+    actioncable (7.1.2)
-      actionpack (= 7.0.7)
+      actionpack (= 7.1.2)
-      activesupport (= 7.0.7)
+      activesupport (= 7.1.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.7)
+      zeitwerk (~> 2.6)
-      actionpack (= 7.0.7)
+    actionmailbox (7.1.2)
-      activejob (= 7.0.7)
+      actionpack (= 7.1.2)
-      activerecord (= 7.0.7)
+      activejob (= 7.1.2)
-      activestorage (= 7.0.7)
+      activerecord (= 7.1.2)
-      activesupport (= 7.0.7)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.7)
+    actionmailer (7.1.2)
-      actionpack (= 7.0.7)
+      actionpack (= 7.1.2)
-      actionview (= 7.0.7)
+      actionview (= 7.1.2)
-      activejob (= 7.0.7)
+      activejob (= 7.1.2)
-      activesupport (= 7.0.7)
+      activesupport (= 7.1.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
-      rails-dom-testing (~> 2.0)
+      rails-dom-testing (~> 2.2)
-    actionpack (7.0.7)
+    actionpack (7.1.2)
-      actionview (= 7.0.7)
+      actionview (= 7.1.2)
-      activesupport (= 7.0.7)
+      activesupport (= 7.1.2)
-      rack (~> 2.0, >= 2.2.4)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
+      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+      rails-html-sanitizer (~> 1.6)
-    actiontext (7.0.7)
+    actiontext (7.1.2)
-      actionpack (= 7.0.7)
+      actionpack (= 7.1.2)
-      activerecord (= 7.0.7)
+      activerecord (= 7.1.2)
-      activestorage (= 7.0.7)
+      activestorage (= 7.1.2)
-      activesupport (= 7.0.7)
+      activesupport (= 7.1.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.7)
+    actionview (7.1.2)
-      activesupport (= 7.0.7)
+      activesupport (= 7.1.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
+      erubi (~> 1.11)
-      rails-dom-testing (~> 2.0)
+      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+      rails-html-sanitizer (~> 1.6)
-    activejob (7.0.7)
+    activejob (7.1.2)
-      activesupport (= 7.0.7)
+      activesupport (= 7.1.2)
       globalid (>= 0.3.6)
-    activemodel (7.0.7)
+    activemodel (7.1.2)
-      activesupport (= 7.0.7)
+      activesupport (= 7.1.2)
-    activerecord (7.0.7)
+    activerecord (7.1.2)
-      activemodel (= 7.0.7)
+      activemodel (= 7.1.2)
-      activesupport (= 7.0.7)
+      activesupport (= 7.1.2)
-    activestorage (7.0.7)
+      timeout (>= 0.4.0)
-      actionpack (= 7.0.7)
+    activestorage (7.1.2)
-      activejob (= 7.0.7)
+      actionpack (= 7.1.2)
-      activerecord (= 7.0.7)
+      activejob (= 7.1.2)
-      activesupport (= 7.0.7)
+      activerecord (= 7.1.2)
+      activesupport (= 7.1.2)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
+    activesupport (7.1.2)
-    activesupport (7.0.7)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
-    aws-eventstream (1.2.0)
+    aws-eventstream (1.3.0)
-    aws-partitions (1.807.0)
+    aws-partitions (1.874.0)
-    aws-sdk-core (3.180.3)
+    aws-sdk-core (3.190.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
+    aws-sdk-kms (1.75.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.132.1)
+    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.179.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
+      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.6.0)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-storage-blob (2.0.3)
       azure-storage-common (~> 2.0)
@@ -98,7 +107,8 @@ GEM
       faraday_middleware (~> 1.0, >= 1.0.0.rc1)
       net-http-persistent (~> 4.0)
       nokogiri (~> 1, >= 1.10.8)
-    bcrypt (3.1.19)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
     better_html (2.0.2)
       actionview (>= 6.0)
       activesupport (>= 6.0)
@@ -106,11 +116,12 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
+    bigdecimal (3.1.5)
     bindex (0.8.1)
-    bootsnap (1.16.0)
+    bootsnap (1.17.0)
       msgpack (~> 1.2)
     builder (3.2.4)
-    bullet (7.0.7)
+    bullet (7.1.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     cancancan (3.5.0)
@@ -131,17 +142,17 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.14.0)
+    css_parser (1.16.0)
       addressable
-    cuprite (0.14.3)
+    cuprite (0.15)
       capybara (~> 3.0)
-      ferrum (~> 0.13.0)
+      ferrum (~> 0.14.0)
-    date (3.3.3)
+    date (3.3.4)
-    debug (1.8.0)
+    debug (1.9.1)
-      irb (>= 1.5.0)
+      irb (~> 1.10)
-      reline (>= 0.3.1)
+      reline (>= 0.3.8)
     declarative (0.0.20)
-    devise (4.9.2)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -157,8 +168,10 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     docile (1.4.0)
     dotenv (2.8.1)
+    drb (2.2.0)
+      ruby2_keywords
     email_typo (0.2.3)
-    erb_lint (0.4.0)
+    erb_lint (0.5.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -166,12 +179,12 @@ GEM
       rubocop
       smart_properties
     erubi (1.12.0)
-    factory_bot (6.2.1)
+    factory_bot (6.4.4)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
+    factory_bot_rails (6.4.2)
-      factory_bot (~> 6.2.0)
+      factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faker (3.2.1)
+    faker (3.2.2)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
@@ -200,16 +213,16 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    ferrum (0.13)
+    ferrum (0.14)
       addressable (~> 2.5)
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
-    ffi (1.15.5)
+    ffi (1.16.3)
     geom2d (0.4.1)
-    globalid (1.1.0)
+    globalid (1.2.1)
-      activesupport (>= 5.0)
+      activesupport (>= 6.1)
-    google-apis-core (0.11.1)
+    google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -220,32 +233,31 @@ GEM
       webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
+    google-apis-storage_v1 (0.29.0)
-      google-apis-core (>= 0.9.0, < 2.a)
+      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.0)
+    google-cloud-core (1.6.1)
-      google-cloud-env (~> 1.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
+    google-cloud-env (2.1.0)
-      faraday (>= 0.17.3, < 3.0)
+      faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.45.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.29.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.7.0)
+    googleauth (1.9.1)
-      faraday (>= 0.17.3, < 3.a)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     hashery (2.1.2)
-    hashie (5.0.0)
     hexapdf (0.34.1)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.4, >= 0.4.1)
@@ -257,11 +269,12 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.6.0)
+    io-console (0.7.1)
-    irb (1.7.4)
+    irb (1.11.0)
-      reline (>= 0.3.6)
+      rdoc
+      reline (>= 0.3.8)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.1)
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
@@ -273,12 +286,12 @@ GEM
       letter_opener (~> 1.7)
       railties (>= 5.2)
       rexml
-    lograge (0.13.0)
+    lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -288,78 +301,48 @@ GEM
       net-smtp
     marcel (1.0.2)
     matrix (0.4.2)
-    memoist (0.16.2)
     method_source (1.0.0)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    multi_xml (0.6.0)
     multipart-post (2.3.0)
+    mutex_m (0.2.0)
     mysql2 (0.5.5)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.3.7)
+    net-imap (0.4.9)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
-    nio4r (2.5.9)
+    nio4r (2.7.0)
-    nokogiri (1.15.4)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-arm64-darwin)
+    oj (3.16.3)
-      racc (~> 1.4)
+      bigdecimal (>= 3.0)
-    oauth2 (2.0.9)
-      faraday (>= 0.17.3, < 3.0)
-      jwt (>= 1.0, < 3.0)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 4)
-      snaky_hash (~> 2.0)
-      version_gem (~> 1.1)
-    oj (3.16.0)
-    omniauth (2.1.1)
-      hashie (>= 3.4.6)
-      rack (>= 2.2.3)
-      rack-protection
-    omniauth-github (2.0.1)
-      omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.8)
-    omniauth-google-oauth2 (1.1.1)
-      jwt (>= 2.0)
-      oauth2 (~> 2.0.6)
-      omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.8.0)
-    omniauth-microsoft-office365 (0.0.8)
-      omniauth
-      omniauth-oauth2
-    omniauth-oauth2 (1.8.0)
-      oauth2 (>= 1.4, < 3)
-      omniauth (~> 2.0)
-    omniauth-rails_csrf_protection (1.0.1)
-      actionpack (>= 4.2)
-      omniauth (~> 2.0)
     openssl (3.2.0)
     orm_adapter (0.5.0)
     os (1.1.4)
-    pagy (6.0.4)
+    pagy (6.2.0)
-    parallel (1.23.0)
+    parallel (1.24.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
-    pdf-reader (2.11.0)
+    pdf-reader (2.12.0)
       Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.5.3)
+    pg (1.5.4)
     premailer (1.21.0)
       addressable
       css_parser (>= 1.12.0)
@@ -373,31 +356,36 @@ GEM
       method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (5.0.3)
+    psych (5.1.2)
-    puma (6.3.1)
+      stringio
+    public_suffix (5.0.4)
+    puma (6.4.0)
       nio4r (~> 2.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.8)
-    rack-protection (3.1.0)
+    rack-proxy (0.7.7)
-      rack (~> 2.2, >= 2.2.4)
-    rack-proxy (0.7.6)
       rack
+    rack-session (1.0.2)
+      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.7)
+    rackup (1.0.0)
-      actioncable (= 7.0.7)
+      rack (< 3)
-      actionmailbox (= 7.0.7)
+      webrick
-      actionmailer (= 7.0.7)
+    rails (7.1.2)
-      actionpack (= 7.0.7)
+      actioncable (= 7.1.2)
-      actiontext (= 7.0.7)
+      actionmailbox (= 7.1.2)
-      actionview (= 7.0.7)
+      actionmailer (= 7.1.2)
-      activejob (= 7.0.7)
+      actionpack (= 7.1.2)
-      activemodel (= 7.0.7)
+      actiontext (= 7.1.2)
-      activerecord (= 7.0.7)
+      actionview (= 7.1.2)
-      activestorage (= 7.0.7)
+      activejob (= 7.1.2)
-      activesupport (= 7.0.7)
+      activemodel (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
       bundler (>= 1.15.0)
-      railties (= 7.0.7)
+      railties (= 7.1.2)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -412,19 +400,22 @@ GEM
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (7.0.7)
+    railties (7.1.2)
-      actionpack (= 7.0.7)
+      actionpack (= 7.1.2)
-      activesupport (= 7.0.7)
+      activesupport (= 7.1.2)
-      method_source
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
+      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.5)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
-    redis-client (0.16.0)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
+    redis-client (0.19.1)
       connection_pool
-    regexp_parser (2.8.2)
+    regexp_parser (2.8.3)
-    reline (0.3.8)
+    reline (0.4.1)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -432,12 +423,12 @@ GEM
       uber (< 0.2.0)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
     rexml (3.2.6)
-    rollbar (3.4.0)
+    rollbar (3.4.2)
     rotp (6.3.0)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
@@ -451,7 +442,7 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
+    rspec-rails (6.1.0)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -460,7 +451,7 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     rspec-support (3.12.1)
-    rubocop (1.57.2)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -468,7 +459,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -477,20 +468,21 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-performance (1.19.1)
+    rubocop-performance (1.20.1)
-      rubocop (>= 1.7.0, < 2.0)
+      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 0.4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.22.1)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rspec (2.25.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.0)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyXL (3.4.25)
@@ -498,17 +490,17 @@ GEM
       rubyzip (>= 1.3.0)
     rubyzip (2.3.2)
     semantic_range (3.0.0)
-    shakapacker (7.0.3)
+    shakapacker (7.1.0)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    sidekiq (7.1.2)
+    sidekiq (7.2.0)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
       redis-client (>= 0.14.0)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -520,38 +512,35 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    snaky_hash (2.0.1)
+    sqlite3 (1.7.0)
-      hashie
-      version_gem (~> 1.1, >= 1.1.1)
-    sqlite3 (1.6.3)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (1.6.3-arm64-darwin)
+    sqlite3 (1.7.0-arm64-darwin)
+    stringio (3.1.0)
     strip_attributes (1.13.0)
       activemodel (>= 3.0, < 8.0)
-    thor (1.2.2)
+    thor (1.3.0)
-    timeout (0.4.0)
+    timeout (0.4.1)
     trailblazer-option (0.1.2)
     ttfunk (1.7.0)
-    turbo-rails (1.4.0)
+    turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.3)
+    tzinfo-data (1.2023.4)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
-    version_gem (1.1.3)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.2.0)
+    web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.18.1)
+    webmock (3.19.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -561,7 +550,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   arm64-darwin-22
@@ -595,16 +584,13 @@ DEPENDENCIES
   lograge
   mysql2
   oj
-  omniauth-github
-  omniauth-google-oauth2
-  omniauth-microsoft-office365
-  omniauth-rails_csrf_protection
   pagy
   pdf-reader
   pg
   premailer-rails
   pry-rails
   puma
+  rack
   rails
   rails-i18n
   rails_autolink
@@ -632,4 +618,4 @@ RUBY VERSION
    ruby 3.2.2p53
 
 BUNDLED WITH
-   2.4.10
+   2.5.3

app/controllers/account_configs_controller.rb

@@ -6,7 +6,8 @@ class AccountConfigsController < ApplicationController
 
   ALLOWED_KEYS = [
     AccountConfig::ALLOW_TYPED_SIGNATURE,
-    AccountConfig::FORCE_MFA
+    AccountConfig::FORCE_MFA,
+    AccountConfig::ESIGNING_PREFERENCE_KEY
   ].freeze
 
   def create

app/controllers/api/api_base_controller.rb

@@ -19,6 +19,12 @@ module Api
 
         render json: { error: e.message }, status: :forbidden
       end
+
+      rescue_from JSON::ParserError do |e|
+        Rollbar.error(e) if defined?(Rollbar)
+
+        render json: { error: "JSON parse error: #{e.message}" }, status: :unprocessable_entity
+      end
     end
 
     private
@@ -27,12 +33,23 @@ module Api
       result = relation.order(id: :desc)
                        .limit([params.fetch(:limit, DEFAULT_LIMIT).to_i, MAX_LIMIT].min)
 
-      result = result.where('id < ?', params[:after]) if params[:after].present?
+      result = result.where(relation.arel_table[:id].lt(params[:after])) if params[:after].present?
-      result = result.where('id > ?', params[:before]) if params[:before].present?
+      result = result.where(relation.arel_table[:id].gt(params[:before])) if params[:before].present?
 
       result
     end
 
+    def authenticate_user!
+      @current_user ||=
+        if request.headers['X-Auth-Token'].present?
+          sha256 = Digest::SHA256.hexdigest(request.headers['X-Auth-Token'])
+
+          User.joins(:access_token).find_by(access_token: { sha256: })
+        end
+
+      render json: { error: 'Not authenticated' }, status: :unauthorized unless current_user
+    end
+
     def current_account
       current_user&.account
     end

app/controllers/api/submissions_controller.rb

@@ -31,29 +31,40 @@ module Api
     end
 
     def show
-      serialized_subbmitters =
+      submitters = @submission.submitters.preload(documents_attachments: :blob, attachments_attachments: :blob)
-        @submission.submitters.preload(documents_attachments: :blob, attachments_attachments: :blob).map do |submitter|
-          Submissions::EnsureResultGenerated.call(submitter) if submitter.completed_at?
 
-          Submitters::SerializeForApi.call(submitter)
+      serialized_submitters = submitters.map do |submitter|
-        end
+        Submissions::EnsureResultGenerated.call(submitter) if submitter.completed_at?
+
+        Submitters::SerializeForApi.call(submitter)
+      end
 
       json = @submission.as_json(
         serialize_params.deep_merge(
-          include: {
+          include: { submission_events: { only: %i[id submitter_id event_type event_timestamp] } }
-            submission_events: {
-              only: %i[id submitter_id event_type event_timestamp]
-            }
-          }
         )
       )
 
-      json[:submitters] = serialized_subbmitters
+      if submitters.all?(&:completed_at?)
+        last_submitter = submitters.max_by(&:completed_at)
+
+        json[:documents] = serialized_submitters.find { |e| e['id'] == last_submitter.id }['documents']
+        json[:status] = 'completed'
+        json[:completed_at] = last_submitter.completed_at
+      else
+        json[:documents] = []
+        json[:status] = 'pending'
+        json[:completed_at] = nil
+      end
+
+      json[:submitters] = serialized_submitters
 
       render json:
     end
 
     def create
+      return render json: { error: 'Template not found' }, status: :unprocessable_entity if @template.nil?
+
       params[:send_email] = true unless params.key?(:send_email)
       params[:send_sms] = false unless params.key?(:send_sms)
 
@@ -67,9 +78,9 @@ module Api
     end
 
     def destroy
-      @submission.update!(deleted_at: Time.current)
+      @submission.update!(archived_at: Time.current)
 
-      render json: @submission.as_json(only: %i[id deleted_at])
+      render json: @submission.as_json(only: %i[id], methods: %i[archived_at])
     end
 
     private
@@ -85,7 +96,8 @@ module Api
                                        emails:,
                                        params:)
       else
-        submissions_attrs, attachments = normalize_submissions_params!(submissions_params, template)
+        submissions_attrs, attachments =
+          Submissions::NormalizeParamUtils.normalize_submissions_params!(submissions_params, template)
 
         submissions = Submissions.create_from_submitters(
           template:,
@@ -97,7 +109,8 @@ module Api
           params:
         )
 
-        save_default_value_attachments!(attachments, submissions.flat_map(&:submitters))
+        Submissions::NormalizeParamUtils.save_default_value_attachments!(attachments,
+                                                                         submissions.flat_map(&:submitters))
 
         submissions
       end
@@ -105,7 +118,7 @@ module Api
 
     def serialize_params
       {
-        only: %i[id source submitters_order created_at updated_at],
+        only: %i[id source submitters_order created_at updated_at archived_at],
         methods: %i[audit_log_url],
         include: {
           submitters: { only: %i[id slug uuid name email phone
@@ -133,49 +146,5 @@ module Api
         ]
       ).fetch(key, [])
     end
-
-    def normalize_submissions_params!(submissions_params, template)
-      attachments = []
-
-      Array.wrap(submissions_params).each do |submission|
-        submission[:submitters].each_with_index do |submitter, index|
-          default_values = submitter[:values] || {}
-
-          submitter[:fields]&.each { |f| default_values[f[:name]] = f[:default_value] if f[:default_value].present? }
-
-          next if default_values.blank?
-
-          values, new_attachments =
-            Submitters::NormalizeValues.call(template,
-                                             default_values,
-                                             submitter[:role] || template.submitters[index]['name'],
-                                             throw_errors: true)
-
-          attachments.push(*new_attachments)
-
-          submitter[:values] = values
-        end
-      end
-
-      [submissions_params, attachments]
-    end
-
-    def save_default_value_attachments!(attachments, submitters)
-      return if attachments.blank?
-
-      attachments_index = attachments.index_by(&:uuid)
-
-      submitters.each do |submitter|
-        submitter.values.to_a.each do |_, value|
-          attachment = attachments_index[value]
-
-          next unless attachment
-
-          attachment.record = submitter
-
-          attachment.save!
-        end
-      end
-    end
   end
 end

app/controllers/api/submitters_controller.rb

@@ -30,5 +30,87 @@ module Api
 
       render json: Submitters::SerializeForApi.call(@submitter, with_template: true, with_events: true)
     end
+
+    def update
+      if @submitter.completed_at?
+        return render json: { error: 'Submitter has already completed the submission.' }, status: :unprocessable_entity
+      end
+
+      role = @submitter.submission.template_submitters.find { |e| e['uuid'] == @submitter.uuid }['name']
+
+      normalized_params, new_attachments =
+        Submissions::NormalizeParamUtils.normalize_submitter_params!(submitter_params.merge(role:), @submitter.template,
+                                                                     for_submitter: @submitter)
+
+      Submissions::CreateFromSubmitters.maybe_set_template_fields(@submitter.submission,
+                                                                  [normalized_params],
+                                                                  submitter_uuid: @submitter.uuid)
+
+      assign_submitter_attrs(@submitter, normalized_params)
+
+      ApplicationRecord.transaction do
+        Submissions::NormalizeParamUtils.save_default_value_attachments!(new_attachments, [@submitter])
+
+        @submitter.save!
+
+        @submitter.submission.save!
+      end
+
+      if @submitter.completed_at?
+        ProcessSubmitterCompletionJob.perform_later(@submitter)
+      elsif normalized_params[:send_email] || normalized_params[:send_sms]
+        Submitters.send_signature_requests([@submitter])
+      end
+
+      render json: Submitters::SerializeForApi.call(@submitter, with_template: false, with_events: false)
+    end
+
+    def submitter_params
+      submitter_params = params.key?(:submitter) ? params.require(:submitter) : params
+
+      submitter_params.permit(
+        :send_email, :send_sms, :uuid, :name, :email, :role, :completed, :phone, :application_key,
+        { values: {}, readonly_fields: [], message: %i[subject body],
+          fields: [%i[name default_value readonly validation_pattern invalid_message]] }
+      )
+    end
+
+    private
+
+    def assign_submitter_attrs(submitter, attrs)
+      submitter.email = Submissions.normalize_email(attrs[:email]) if attrs.key?(:email)
+      submitter.phone = attrs[:phone].to_s.gsub(/[^0-9+]/, '') if attrs.key?(:phone)
+      submitter.values = submitter.values.merge(attrs[:values].to_unsafe_h) if attrs[:values].present?
+      submitter.completed_at = attrs[:completed] ? Time.current : submitter.completed_at
+      submitter.application_key = attrs[:application_key] if attrs.key?(:application_key)
+
+      assign_submission_fields(submitter.submission)
+      assign_preferences(submitter, attrs)
+
+      submitter
+    end
+
+    def assign_submission_fields(submission)
+      submission.template_fields ||= submission.template.fields
+      submission.template_schema ||= submission.template.schema
+    end
+
+    def assign_preferences(submitter, attrs)
+      submitter_preferences = Submitters.normalize_preferences(submitter.account, current_user, attrs)
+
+      submitter.preferences['default_values'] = attrs[:values].to_unsafe_h if attrs[:values].present?
+
+      if submitter_preferences.key?('send_email')
+        submitter.preferences['send_email'] = submitter_preferences['send_email']
+      end
+
+      submitter.preferences['send_sms'] = submitter_preferences['send_sms'] if submitter_preferences.key?('send_sms')
+
+      return unless submitter_preferences.key?('email_message_uuid')
+
+      submitter.preferences['email_message_uuid'] = submitter_preferences['email_message_uuid']
+
+      submitter
+    end
   end
 end

app/controllers/api/template_folders_autocomplete_controller.rb

@@ -7,10 +7,10 @@ module Api
     LIMIT = 100
 
     def index
-      template_folders = @template_folders.joins(:templates).where(templates: { deleted_at: nil }).distinct
+      template_folders = @template_folders.joins(:templates).where(templates: { archived_at: nil }).distinct
       template_folders = TemplateFolders.search(template_folders, params[:q]).limit(LIMIT)
 
-      render json: template_folders.as_json(only: %i[name deleted_at])
+      render json: template_folders.as_json(only: %i[name archived_at])
     end
   end
 end

app/controllers/api/templates_clone_controller.rb

@@ -7,23 +7,18 @@ module Api
     def create
       authorize!(:manage, @template)
 
-      template = current_account.templates.new(source: :api)
+      cloned_template = Templates::Clone.call(@template,
+                                              author: current_user,
+                                              name: params[:name],
+                                              application_key: params[:application_key],
+                                              folder_name: params[:folder_name])
 
-      template.application_key = params[:application_key]
+      cloned_template.source = :api
-      template.name = params[:name] || "#{@template.name} (Clone)"
+      cloned_template.save!
-      template.account = @template.account
-      template.author = current_user
-      template.assign_attributes(@template.slice(:folder_id, :fields, :schema, :submitters))
 
-      if params[:folder_name].present?
+      Templates::CloneAttachments.call(template: cloned_template, original_template: @template)
-        template.folder = TemplateFolders.find_or_create_by_name(current_user, params[:folder_name])
-      end
 
-      template.save!
+      render json: cloned_template.as_json(serialize_params)
-
-      Templates::CloneAttachments.call(template:, original_template: @template)
-
-      render json: template.as_json(serialize_params)
     end
 
     private

app/controllers/api/templates_controller.rb

@@ -38,9 +38,9 @@ module Api
     end
 
     def destroy
-      @template.update!(deleted_at: Time.current)
+      @template.update!(archived_at: Time.current)
 
-      render json: @template.as_json(only: %i[id deleted_at])
+      render json: @template.as_json(only: %i[id archived_at])
     end
 
     private
@@ -58,7 +58,9 @@ module Api
         schema: [%i[attachment_uuid name]],
         submitters: [%i[name uuid]],
         fields: [[:uuid, :submitter_uuid, :name, :type, :required, :readonly, :default_value,
-                  { options: [%i[value uuid]], areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]]
+                  { preferences: {},
+                    options: [%i[value uuid]],
+                    areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]]
       )
     end
   end

app/controllers/errors_controller.rb

@@ -8,7 +8,11 @@ class ErrorsController < ActionController::Base
     '/templates/html',
     '/api/templates/html',
     '/templates/pdf',
-    '/api/templates/pdf'
+    '/api/templates/pdf',
+    '/templates/doc',
+    '/api/templates/doc',
+    '/templates/docx',
+    '/api/templates/docx'
   ].freeze
 
   def show

app/controllers/omniauth_callbacks_controller.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  def google_oauth2
-    @user = Users.from_omniauth(request.env['omniauth.auth'])
-
-    if @user.persisted?
-      flash[:notice] = I18n.t('devise.omniauth_callbacks.success', kind: 'Google')
-
-      sign_in_and_redirect @user, event: :authentication
-    else
-      redirect_to new_registration_path(oauth_callback: true, user: @user.slice(:email, :first_name, :last_name)),
-                  notice: 'Please complete registration with Google auth'
-    end
-  end
-end

app/controllers/start_form_controller.rb

@@ -13,7 +13,7 @@ class StartFormController < ApplicationController
   end
 
   def update
-    @submitter = Submitter.where(submission: @template.submissions.where(deleted_at: nil))
+    @submitter = Submitter.where(submission: @template.submissions.where(archived_at: nil))
                           .order(id: :desc)
                           .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
                           .find_or_initialize_by(**submitter_params.compact_blank)
@@ -46,13 +46,25 @@ class StartFormController < ApplicationController
   private
 
   def assign_submission_attributes(submitter, template)
+    resubmit_submitter =
+      if params[:resubmit].present?
+        Submitter.where(submission: @template.submissions).find_by(slug: params[:resubmit])
+      end
+
     submitter.assign_attributes(
       uuid: template.submitters.first['uuid'],
       ip: request.remote_ip,
       ua: request.user_agent,
-      preferences: { 'send_email' => true }
+      values: resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
+      preferences: resubmit_submitter&.preferences.presence || { 'send_email' => true }
     )
 
+    if submitter.values.present?
+      resubmit_submitter.attachments.each do |attachment|
+        submitter.attachments << attachment.dup if submitter.values.value?(attachment.uuid)
+      end
+    end
+
     submitter.submission ||= Submission.new(template:,
                                             template_submitters: template.submitters,
                                             source: :link)

app/controllers/submissions_controller.rb

@@ -63,7 +63,7 @@ class SubmissionsController < ApplicationController
   end
 
   def destroy
-    @submission.update!(deleted_at: Time.current)
+    @submission.update!(archived_at: Time.current)
 
     redirect_back(fallback_location: template_path(@submission.template), notice: 'Submission has been archived')
   end

app/controllers/submit_form_controller.rb

@@ -32,7 +32,7 @@ class SubmitFormController < ApplicationController
 
     cookies[:submitter_sid] = @submitter.signed_id
 
-    render @submitter.submission.template.deleted_at? ? :archived : :show
+    render @submitter.submission.template.archived_at? ? :archived : :show
   end
 
   def update
@@ -42,6 +42,12 @@ class SubmitFormController < ApplicationController
       return render json: { error: 'Form has been completed already.' }, status: :unprocessable_entity
     end
 
+    if submitter.template.archived_at? || submitter.submission.archived_at?
+      Rollbar.info("Archived template: #{submitter.template.id}") if defined?(Rollbar)
+
+      return render json: { error: 'Form has been archived.' }, status: :unprocessable_entity
+    end
+
     Submitters::SubmitValues.call(submitter, params, request)
 
     head :ok

app/controllers/templates_archived_controller.rb

@@ -4,7 +4,7 @@ class TemplatesArchivedController < ApplicationController
   load_and_authorize_resource :template, parent: false
 
   def index
-    @templates = @templates.where.not(deleted_at: nil).preload(:author, :folder).order(id: :desc)
+    @templates = @templates.where.not(archived_at: nil).preload(:author, :folder).order(id: :desc)
     @templates = Templates.search(@templates, params[:q])
 
     @pagy, @templates = pagy(@templates, items: 12)

app/controllers/templates_archived_submissions_controller.rb

@@ -5,7 +5,7 @@ class TemplatesArchivedSubmissionsController < ApplicationController
   load_and_authorize_resource :submission, through: :template, parent: false
 
   def index
-    @submissions = @submissions.where.not(deleted_at: nil)
+    @submissions = @submissions.where.not(archived_at: nil)
     @submissions = Submissions.search(@submissions, params[:q])
 
     @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))

app/controllers/templates_controller.rb

@@ -7,7 +7,7 @@ class TemplatesController < ApplicationController
 
   def show
     submissions = @template.submissions
-    submissions = submissions.active if @template.deleted_at.blank?
+    submissions = submissions.active if @template.archived_at.blank?
     submissions = Submissions.search(submissions, params[:q])
 
     @base_submissions = submissions
@@ -42,10 +42,15 @@ class TemplatesController < ApplicationController
   end
 
   def create
-    @template.account = current_account
+    if @base_template
-    @template.author = current_user
+      @template = Templates::Clone.call(@base_template, author: current_user,
-    @template.folder = TemplateFolders.find_or_create_by_name(current_user, params[:folder_name])
+                                                        name: params.dig(:template, :name),
-    @template.assign_attributes(@base_template.slice(:fields, :schema, :submitters)) if @base_template
+                                                        folder_name: params[:folder_name])
+    else
+      @template.account = current_account
+      @template.author = current_user
+      @template.folder = TemplateFolders.find_or_create_by_name(current_user, params[:folder_name])
+    end
 
     if @template.save
       Templates::CloneAttachments.call(template: @template, original_template: @base_template) if @base_template
@@ -65,7 +70,7 @@ class TemplatesController < ApplicationController
 
         'Template has been removed.'
       else
-        @template.update!(deleted_at: Time.current)
+        @template.update!(archived_at: Time.current)
 
         'Template has been archived.'
       end

app/controllers/templates_restore_controller.rb

@@ -4,7 +4,7 @@ class TemplatesRestoreController < ApplicationController
   load_and_authorize_resource :template
 
   def create
-    @template.update!(deleted_at: nil)
+    @template.update!(archived_at: nil)
 
     redirect_to template_path(@template), notice: 'Template has been unarchived'
   end

app/controllers/timestamp_server_controller.rb

@@ -30,6 +30,7 @@ class TimestampServerController < ApplicationController
              reason: 'Test',
              certificate: pkcs.certificate,
              key: pkcs.key,
+             signature_size: 10_000,
              certificate_chain: pkcs.ca_certs || [],
              timestamp_handler: Submissions::TimestampHandler.new(tsa_url: url))
   end

app/controllers/users_controller.rb

@@ -28,9 +28,9 @@ class UsersController < ApplicationController
     return redirect_to settings_users_path, notice: 'Unable to update user.' if Docuseal.demo?
 
     attrs = user_params.compact_blank
-    attrs.delete(:role) if User::ROLES.exclude?(attrs[:role])
+    attrs.delete(:role) if !role_valid?(attrs[:role]) || current_user == @user
 
-    if @user.update(attrs.except(current_user == @user ? :role : nil))
+    if @user.update(attrs)
       redirect_to settings_users_path, notice: 'User has been updated'
     else
       render turbo_stream: turbo_stream.replace(:modal, template: 'users/edit'), status: :unprocessable_entity
@@ -42,17 +42,21 @@ class UsersController < ApplicationController
       return redirect_to settings_users_path, notice: 'Unable to remove user'
     end
 
-    @user.update!(deleted_at: Time.current)
+    @user.update!(archived_at: Time.current)
 
     redirect_to settings_users_path, notice: 'User has been removed'
   end
 
   private
 
+  def role_valid?(role)
+    User::ROLES.include?(role)
+  end
+
   def build_user
     @user = current_account.users.find_by(email: user_params[:email])&.tap do |user|
       user.assign_attributes(user_params)
-      user.deleted_at = nil
+      user.archived_at = nil
     end
 
     @user ||= current_account.users.new(user_params)

app/javascript/application.js

@@ -86,6 +86,7 @@ window.customElements.define('template-builder', class extends HTMLElement {
       backgroundColor: '#faf7f5',
       withPhone: this.dataset.withPhone === 'true',
       withLogo: this.dataset.withLogo !== 'false',
+      withPayment: this.dataset.withPayment === 'true',
       acceptFileTypes: this.dataset.acceptFileTypes,
       isDirectUpload: this.dataset.isDirectUpload === 'true'
     })

app/javascript/application.scss

@@ -75,16 +75,16 @@ button[disabled] .enabled {
   @apply select base-input w-full font-normal;
 }
 
-.tooltip-bottom-end:before {
+.tooltip-bottom-start:before {
-  transform: translateX(-95%);
+  transform: translateX(-30%);
   top: var(--tooltip-offset);
   left: 100%;
   right: auto;
   bottom: auto;
 }
 
-.tooltip-bottom-end:after {
+.tooltip-bottom-start:after {
-  transform: translateX(-25%);
+  transform: translateX(-75%);
   border-color: transparent transparent var(--tooltip-color) transparent;
   top: var(--tooltip-tail-offset);
   left: 50%;

app/javascript/elements/download_button.js

@@ -18,27 +18,64 @@ export default targetable(class extends HTMLElement {
     this.toggleState()
 
     fetch(this.dataset.src).then((response) => response.json()).then((urls) => {
-      const fileRequests = urls.map((url) => {
+      const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
-        return () => {
-          return fetch(url).then(async (resp) => {
-            const blobUrl = URL.createObjectURL(await resp.blob())
-            const link = document.createElement('a')
 
-            link.href = blobUrl
+      if (isSafariIos && urls.length > 1) {
-            link.setAttribute('download', decodeURI(url.split('/').pop()))
+        this.downloadSafariIos(urls)
+      } else {
+        this.downloadUrls(urls)
+      }
+    })
+  }
 
-            link.click()
+  downloadUrls (urls) {
+    const fileRequests = urls.map((url) => {
+      return () => {
+        return fetch(url).then(async (resp) => {
+          const blobUrl = URL.createObjectURL(await resp.blob())
+          const link = document.createElement('a')
 
-            URL.revokeObjectURL(url)
+          link.href = blobUrl
-          })
+          link.setAttribute('download', decodeURI(url.split('/').pop()))
-        }
+
+          link.click()
+
+          URL.revokeObjectURL(blobUrl)
+        })
+      }
+    })
+
+    fileRequests.reduce(
+      (prevPromise, request) => prevPromise.then(() => request()),
+      Promise.resolve()
+    )
+
+    this.toggleState()
+  }
+
+  downloadSafariIos (urls) {
+    const fileRequests = urls.map((url) => {
+      return fetch(url).then(async (resp) => {
+        const blob = await resp.blob()
+        const blobUrl = URL.createObjectURL(blob.slice(0, blob.size, 'application/octet-stream'))
+        const link = document.createElement('a')
+
+        link.href = blobUrl
+        link.setAttribute('download', decodeURI(url.split('/').pop()))
+
+        return link
       })
+    })
 
-      fileRequests.reduce(
+    Promise.all(fileRequests).then((links) => {
-        (prevPromise, request) => prevPromise.then(() => request()),
+      links.forEach((link, index) => {
-        Promise.resolve()
+        setTimeout(() => {
-      )
+          link.click()
 
+          URL.revokeObjectURL(link.href)
+        }, index * 50)
+      })
+    }).finally(() => {
       this.toggleState()
     })
   }

app/javascript/form.js

@@ -10,7 +10,6 @@ window.customElements.define('submission-form', class extends HTMLElement {
 
     this.app = createApp(Form, {
       submitter: JSON.parse(this.dataset.submitter),
-      authenticityToken: this.dataset.authenticityToken,
       canSendEmail: this.dataset.canSendEmail === 'true',
       isDirectUpload: this.dataset.isDirectUpload === 'true',
       goToLast: this.dataset.goToLast === 'true',

app/javascript/submission_form/area.vue

@@ -2,7 +2,7 @@
   <div
     class="flex absolute lg:text-base"
     :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-70': !isActive && !isValueSet && submittable, 'border-red-500 border-dashed z-10': isActive && submittable, 'bg-opacity-30': (isActive || isValueSet) && submittable }"
+    :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 z-10': isActive && submittable, 'bg-opacity-40': (isActive || isValueSet) && submittable }"
   >
     <div
       v-if="!isActive && !isValueSet && field.type !== 'checkbox' && submittable && !area.option_uuid"
@@ -42,6 +42,11 @@
       class="object-contain mx-auto"
       :src="image.url"
     >
+    <img
+      v-else-if="field.type === 'stamp' && stamp"
+      class="object-contain mx-auto"
+      :src="stamp.url"
+    >
     <img
       v-else-if="field.type === 'signature' && signature"
       class="object-contain mx-auto"
@@ -53,7 +58,7 @@
       :src="initials.url"
     >
     <div
-      v-else-if="field.type === 'file'"
+      v-else-if="field.type === 'file' || field.type === 'payment'"
       class="px-0.5 flex flex-col justify-center"
     >
       <a
@@ -158,7 +163,7 @@
 </template>
 
 <script>
-import { IconTextSize, IconWritingSign, IconCalendarEvent, IconPhoto, IconCheckbox, IconPaperclip, IconSelect, IconCircleDot, IconChecks, IconCheck, IconColumns3, IconPhoneCheck, IconLetterCaseUpper } from '@tabler/icons-vue'
+import { IconTextSize, IconWritingSign, IconCalendarEvent, IconPhoto, IconCheckbox, IconPaperclip, IconSelect, IconCircleDot, IconChecks, IconCheck, IconColumns3, IconPhoneCheck, IconLetterCaseUpper, IconCreditCard, IconRubberStamp } from '@tabler/icons-vue'
 
 export default {
   name: 'FieldArea',
@@ -225,13 +230,15 @@ export default {
         signature: 'Signature',
         date: 'Date',
         image: 'Image',
+        stamp: 'Stamp',
         initials: 'Initials',
         file: 'File',
         select: 'Select',
         checkbox: 'Checkbox',
         radio: 'Radio',
         multiple: 'Multiple Select',
-        phone: 'Phone'
+        phone: 'Phone',
+        payment: 'Payment'
       }
     },
     fieldIcons () {
@@ -245,9 +252,11 @@ export default {
         select: IconSelect,
         checkbox: IconCheckbox,
         radio: IconCircleDot,
+        stamp: IconRubberStamp,
         cells: IconColumns3,
         multiple: IconChecks,
-        phone: IconPhoneCheck
+        phone: IconPhoneCheck,
+        payment: IconCreditCard
       }
     },
     image () {
@@ -257,6 +266,13 @@ export default {
         return null
       }
     },
+    stamp () {
+      if (this.field.type === 'stamp') {
+        return this.attachmentsIndex[this.modelValue]
+      } else {
+        return null
+      }
+    },
     signature () {
       if (this.field.type === 'signature') {
         return this.attachmentsIndex[this.modelValue]
@@ -271,9 +287,15 @@ export default {
         return null
       }
     },
+    locale () {
+      return Intl.DateTimeFormat().resolvedOptions()?.locale
+    },
     formattedDate () {
       if (this.field.type === 'date' && this.modelValue) {
-        return new Intl.DateTimeFormat([], { year: 'numeric', month: 'long', day: 'numeric', timeZone: 'UTC' }).format(new Date(this.modelValue))
+        return this.formatDate(
+          new Date(this.modelValue),
+          this.field.preferences?.format || (this.locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY')
+        )
       } else {
         return ''
       }
@@ -281,6 +303,8 @@ export default {
     attachments () {
       if (this.field.type === 'file') {
         return (this.modelValue || []).map((uuid) => this.attachmentsIndex[uuid])
+      } else if (this.field.type === 'payment') {
+        return [this.attachmentsIndex[this.modelValue]].filter(Boolean)
       } else {
         return []
       }
@@ -311,6 +335,36 @@ export default {
     }
   },
   methods: {
+    formatDate (date, format) {
+      const monthFormats = {
+        M: 'numeric',
+        MM: '2-digit',
+        MMM: 'short',
+        MMMM: 'long'
+      }
+
+      const dayFormats = {
+        D: 'numeric',
+        DD: '2-digit'
+      }
+
+      const yearFormats = {
+        YYYY: 'numeric',
+        YY: '2-digit'
+      }
+
+      const parts = new Intl.DateTimeFormat([], {
+        day: dayFormats[format.match(/D+/)],
+        month: monthFormats[format.match(/M+/)],
+        year: yearFormats[format.match(/Y+/)],
+        timeZone: 'UTC'
+      }).formatToParts(date)
+
+      return format
+        .replace(/D+/, parts.find((p) => p.type === 'day').value)
+        .replace(/M+/, parts.find((p) => p.type === 'month').value)
+        .replace(/Y+/, parts.find((p) => p.type === 'year').value)
+    },
     updateMultipleSelectValue (value) {
       if (this.modelValue?.includes(value)) {
         const newValue = [...this.modelValue]

app/javascript/submission_form/areas.vue

@@ -12,6 +12,7 @@
         :key="areaIndex"
       >
         <Teleport
+          v-if="findPageElementForArea(area)"
           :to="findPageElementForArea(area)"
         >
           <FieldArea

app/javascript/submission_form/completed.vue

@@ -21,7 +21,7 @@
         </span>
       </a>
       <button
-        v-if="canSendEmail && !isDemo"
+        v-if="canSendEmail && !isDemo && withSendCopyButton"
         class="white-button !h-auto flex items-center space-x-1 w-full"
         :disabled="isSendingCopy"
         @click.prevent="sendCopyToEmail"
@@ -36,7 +36,7 @@
         </span>
       </button>
       <button
-        v-if="!isWebView"
+        v-if="!isWebView && withDownloadButton"
         class="base-button flex items-center space-x-1 w-full"
         :disabled="isDownloading"
         @click.prevent="download"
@@ -115,6 +115,16 @@ export default {
       required: false,
       default: true
     },
+    withDownloadButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    withSendCopyButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     withConfetti: {
       type: Boolean,
       required: false,
@@ -169,27 +179,62 @@ export default {
       this.isDownloading = true
 
       fetch(this.baseUrl + `/submitters/${this.submitterSlug}/download`).then((response) => response.json()).then((urls) => {
-        const fileRequests = urls.map((url) => {
+        const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
-          return () => {
-            return fetch(url).then(async (resp) => {
-              const blobUrl = URL.createObjectURL(await resp.blob())
-              const link = document.createElement('a')
 
-              link.href = blobUrl
+        if (isSafariIos && urls.length > 1) {
-              link.setAttribute('download', decodeURI(url.split('/').pop()))
+          this.downloadSafariIos(urls)
+        } else {
+          this.downloadUrls(urls)
+        }
+      })
+    },
+    downloadUrls (urls) {
+      const fileRequests = urls.map((url) => {
+        return () => {
+          return fetch(url).then(async (resp) => {
+            const blobUrl = URL.createObjectURL(await resp.blob())
+            const link = document.createElement('a')
 
-              link.click()
+            link.href = blobUrl
+            link.setAttribute('download', decodeURI(url.split('/').pop()))
 
-              URL.revokeObjectURL(url)
+            link.click()
-            })
+
-          }
+            URL.revokeObjectURL(blobUrl)
+          })
+        }
+      })
+
+      fileRequests.reduce(
+        (prevPromise, request) => prevPromise.then(() => request()),
+        Promise.resolve()
+      )
+
+      this.isDownloading = false
+    },
+    downloadSafariIos (urls) {
+      const fileRequests = urls.map((url) => {
+        return fetch(url).then(async (resp) => {
+          const blob = await resp.blob()
+          const blobUrl = URL.createObjectURL(blob.slice(0, blob.size, 'application/octet-stream'))
+          const link = document.createElement('a')
+
+          link.href = blobUrl
+          link.setAttribute('download', decodeURI(url.split('/').pop()))
+
+          return link
         })
+      })
 
-        fileRequests.reduce(
+      Promise.all(fileRequests).then((links) => {
-          (prevPromise, request) => prevPromise.then(() => request()),
+        links.forEach((link, index) => {
-          Promise.resolve()
+          setTimeout(() => {
-        )
+            link.click()
 
+            URL.revokeObjectURL(link.href)
+          }, index * 50)
+        })
+      }).finally(() => {
         this.isDownloading = false
       })
     }

app/javascript/submission_form/form.vue

@@ -10,6 +10,7 @@
   />
   <button
     v-if="!isFormVisible"
+    id="expand_form_button"
     class="btn btn-neutral flex text-white absolute rounded-none border-x-0 md:border md:rounded-full bottom-0 w-full md:mb-4 text-base"
     @click.prevent="isFormVisible = true"
   >
@@ -28,6 +29,7 @@
   >
     <button
       v-if="!isCompleted"
+      id="minimize_form_button"
       class="absolute right-0 mr-2 mt-2 top-0 hidden md:block"
       title="Minimize"
       @click.prevent="isFormVisible = false"
@@ -206,7 +208,7 @@
             </div>
           </div>
           <ImageStep
-            v-else-if="currentField.type === 'image'"
+            v-else-if="currentField.type === 'image' || currentField.type === 'stamp'"
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
             :field="currentField"
@@ -266,9 +268,24 @@
             @focus="$refs.areas.scrollIntoField(currentField)"
             @submit="submitStep"
           />
+          <PaymentStep
+            v-else-if="currentField.type === 'payment'"
+            ref="currentStep"
+            :key="currentField.uuid"
+            v-model="values[currentField.uuid]"
+            :field="currentField"
+            :submitter-slug="submitterSlug"
+            @attached="attachments.push($event)"
+            @focus="$refs.areas.scrollIntoField(currentField)"
+            @submit="submitStep"
+          />
         </div>
-        <div class="mt-6 md:mt-8">
+        <div
+          v-if="currentField.type !== 'payment' || submittedValues[currentField.uuid]"
+          class="mt-6 md:mt-8"
+        >
           <button
+            id="submit_form_button"
             ref="submitButton"
             type="submit"
             class="base-button w-full flex justify-center"
@@ -303,22 +320,31 @@
         :is-demo="isDemo"
         :attribution="attribution"
         :completed-button="completedButton"
+        :with-send-copy-button="withSendCopyButton"
+        :with-download-button="withDownloadButton"
         :with-confetti="withConfetti"
         :can-send-email="canSendEmail && !!submitter.email"
         :submitter-slug="submitterSlug"
       />
-      <div class="flex justify-center">
+      <div
-        <div class="flex items-center mt-5 mb-1">
+        v-if="stepFields.length < 80"
+        class="flex justify-center"
+      >
+        <div class="flex items-center mt-4 mb-1 flex-wrap">
           <a
             v-for="(step, index) in stepFields"
             :key="step[0].uuid"
             href="#"
-            class="inline border border-base-300 h-3 w-3 rounded-full mx-1"
+            class="inline border border-base-300 h-3 w-3 rounded-full mx-1 mt-1"
             :class="{ 'bg-base-300': index === currentStep, 'bg-base-content': (index < currentStep && stepFields[index].every((f) => !f.required || ![null, undefined, ''].includes(values[f.uuid]))) || isCompleted, 'bg-white': index > currentStep }"
             @click.prevent="isCompleted ? '' : [saveStep(), goToStep(step, true)]"
           />
         </div>
       </div>
+      <div
+        v-else
+        class="mt-5"
+      />
     </div>
   </div>
 </template>
@@ -331,6 +357,7 @@ import InitialsStep from './initials_step'
 import AttachmentStep from './attachment_step'
 import MultiSelectStep from './multi_select_step'
 import PhoneStep from './phone_step'
+import PaymentStep from './payment_step'
 import TextStep from './text_step'
 import DateStep from './date_step'
 import FormCompleted from './completed'
@@ -351,6 +378,7 @@ export default {
     IconArrowsDiagonal,
     TextStep,
     PhoneStep,
+    PaymentStep,
     IconArrowsDiagonalMinimize2,
     FormCompleted
   },
@@ -402,11 +430,6 @@ export default {
       required: false,
       default: () => []
     },
-    authenticityToken: {
-      type: String,
-      required: false,
-      default: ''
-    },
     backgroundColor: {
       type: String,
       required: false,
@@ -442,6 +465,16 @@ export default {
       required: false,
       default: () => ({})
     },
+    withSendCopyButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    withDownloadButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     completedButton: {
       type: Object,
       required: false,
@@ -463,6 +496,12 @@ export default {
     currentStepFields () {
       return this.stepFields[this.currentStep]
     },
+    queryParams () {
+      return new URLSearchParams(window.location.search)
+    },
+    authenticityToken () {
+      return document.querySelector('meta[name="csrf-token"]')?.content
+    },
     submitterSlug () {
       return this.submitter.slug
     },
@@ -525,7 +564,13 @@ export default {
       }
     })
 
-    if (this.goToLast) {
+    if (this.queryParams.get('field_uuid')) {
+      const stepIndex = this.stepFields.findIndex((fields) => {
+        return fields.some((f) => f.uuid === this.queryParams.get('field_uuid'))
+      })
+
+      this.currentStep = Math.max(stepIndex, 0)
+    } else if (this.goToLast) {
       const requiredEmptyStepIndex = this.stepFields.indexOf(this.stepFields.find((fields) => fields.some((f) => f.required && !this.submittedValues[f.uuid])))
       const lastFilledStepIndex = this.stepFields.indexOf([...this.stepFields].reverse().find((fields) => fields.some((f) => !!this.submittedValues[f.uuid]))) + 1
 
@@ -570,7 +615,7 @@ export default {
   methods: {
     t,
     maybeTrackEmailClick () {
-      const queryParams = new URLSearchParams(window.location.search)
+      const { queryParams } = this
 
       if (queryParams.has('t')) {
         const t = queryParams.get('t')
@@ -594,7 +639,7 @@ export default {
       }
     },
     maybeTrackSmsClick () {
-      const queryParams = new URLSearchParams(window.location.search)
+      const { queryParams } = this
 
       if (queryParams.has('c')) {
         const c = queryParams.get('c')
@@ -667,7 +712,7 @@ export default {
     async submitStep () {
       this.isSubmitting = true
 
-      const stepPromise = ['signature', 'phone', 'initials'].includes(this.currentField.type)
+      const stepPromise = ['signature', 'phone', 'initials', 'payment'].includes(this.currentField.type)
         ? this.$refs.currentStep.submit
         : () => Promise.resolve({})
 
@@ -684,7 +729,7 @@ export default {
         }
 
         await this.saveStep(formData).then(async (response) => {
-          if (response.status === 422) {
+          if (response.status === 422 || response.status === 500) {
             const data = await response.json()
 
             alert(data.error || 'Value is invalid')
@@ -714,7 +759,7 @@ export default {
             }
           }
         }).catch(error => {
-          console.error('Error submitting form:', error)
+          console.error(error)
         }).finally(() => {
           this.isSubmitting = false
         })

app/javascript/submission_form/i18n.js

@@ -38,7 +38,9 @@ const en = {
   type: 'Type',
   type_text: 'Type text',
   date: 'Date',
-  email_has_been_sent: 'Email has been sent'
+  email_has_been_sent: 'Email has been sent',
+  processing: 'Processing',
+  pay_with_strip: 'Pay with Stripe'
 }
 
 const es = {
@@ -81,7 +83,9 @@ const es = {
   draw: 'Dibujar',
   type: 'Escribir',
   type_text: 'Escribir texto',
-  email_has_been_sent: 'El correo electrónico ha sido enviado'
+  email_has_been_sent: 'El correo electrónico ha sido enviado',
+  processing: 'Procesando',
+  pay_with_strip: 'Pagar con Stripe'
 }
 
 const it = {
@@ -124,7 +128,9 @@ const it = {
   type: 'Inserisci',
   type_text: 'Inserisci testo',
   toggle_multiline_text: 'Attiva Testo Multilinea',
-  email_has_been_sent: "L'email è stata inviata"
+  email_has_been_sent: "L'email è stata inviata",
+  processing: 'Elaborazione',
+  pay_with_strip: 'Paga con Stripe'
 }
 
 const de = {
@@ -167,7 +173,9 @@ const de = {
   type: 'Eingeben',
   type_text: 'Text eingeben',
   toggle_multiline_text: 'Mehrzeiligen Text umschalten',
-  email_has_been_sent: 'Die E-Mail wurde gesendet'
+  email_has_been_sent: 'Die E-Mail wurde gesendet',
+  processing: 'Verarbeitung',
+  pay_with_strip: 'Mit Stripe bezahlen'
 }
 
 const fr = {
@@ -210,7 +218,9 @@ const fr = {
   type: 'Saisir',
   type_text: 'Saisir du texte',
   toggle_multiline_text: 'Basculer le Texte Multiligne',
-  email_has_been_sent: "L'email a été envoyé"
+  email_has_been_sent: "L'email a été envoyé",
+  processing: 'Traitement',
+  pay_with_strip: 'Paiement avec Stripe'
 }
 
 const pl = {
@@ -253,7 +263,9 @@ const pl = {
   type: 'Wprowadź',
   type_text: 'Wprowadź tekst',
   toggle_multiline_text: 'Przełącz Tekst Wielolinijkowy',
-  email_has_been_sent: 'E-mail został wysłany'
+  email_has_been_sent: 'E-mail został wysłany',
+  processing: 'Przetwarzanie',
+  pay_with_strip: 'Płatność za pomocą Stripe'
 }
 
 const uk = {
@@ -296,7 +308,9 @@ const uk = {
   type: 'Текст',
   type_text: 'Введіть текст',
   toggle_multiline_text: 'Перемкнути Багаторядковий Текст',
-  email_has_been_sent: 'Електронний лист був відправлений'
+  email_has_been_sent: 'Електронний лист був відправлений',
+  processing: 'Обробка',
+  pay_with_strip: 'Сплатити за допомогою Stripe'
 }
 
 const cs = {
@@ -339,7 +353,9 @@ const cs = {
   type: 'Zadat',
   type_text: 'Zadat text',
   toggle_multiline_text: 'Přepnout Víceřádkový Text',
-  email_has_been_sent: 'E-mail byl odeslán'
+  email_has_been_sent: 'E-mail byl odeslán',
+  processing: 'Zpracování',
+  pay_with_strip: 'Zaplacení přes Stripe'
 }
 
 const pt = {
@@ -382,7 +398,9 @@ const pt = {
   type: 'Inserir',
   type_text: 'Inserir texto',
   toggle_multiline_text: 'Alternar Texto Multilinha',
-  email_has_been_sent: 'Email enviado'
+  email_has_been_sent: 'Email enviado',
+  processing: 'Processamento',
+  pay_with_strip: 'Pagar com Stripe'
 }
 
 const i18n = { en, es, it, de, fr, pl, uk, cs, pt }

app/javascript/submission_form/payment_step.vue

@@ -0,0 +1,181 @@
+<template>
+  <label
+    v-if="!modelValue && !sessionId"
+    :for="field.uuid"
+    class="label text-2xl mb-2"
+  >{{ field.name || defaultName }}
+  </label>
+  <div>
+    <input
+      type="text"
+      :value="modelValue"
+      hidden
+      :name="`values[${field.uuid}]`"
+      class="hidden"
+    >
+    <div
+      v-if="modelValue && !sessionId"
+      class=" text-2xl mb-2"
+    >
+      Already paid
+    </div>
+    <div v-else>
+      <button
+        v-if="sessionId"
+        disabled
+        class="base-button w-full"
+      >
+        <IconLoader
+          width="22"
+          class="animate-spin"
+        />
+        <span>
+          {{ t('processing') }}...
+        </span>
+      </button>
+      <button
+        v-else
+        :id="field.uuid"
+        class="btn bg-[#7B73FF] text-white hover:bg-[#0A2540] text-lg w-full"
+        :class="{ disabled: isCreatingCheckout }"
+        :disabled="isCreatingCheckout"
+        @click.prevent="startCheckout"
+      >
+        <IconInnerShadowTop
+          v-if="isCreatingCheckout"
+          width="22"
+          class="animate-spin"
+        />
+        <IconBrandStripe
+          v-else
+          width="22"
+        />
+        <span>
+          {{ t('pay_with_strip') }}
+        </span>
+      </button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { IconBrandStripe, IconInnerShadowTop, IconLoader } from '@tabler/icons-vue'
+
+export default {
+  name: 'PaymentStep',
+  components: {
+    IconBrandStripe,
+    IconInnerShadowTop,
+    IconLoader
+  },
+  inject: ['baseUrl', 't'],
+  props: {
+    modelValue: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    field: {
+      type: Object,
+      required: true
+    },
+    submitterSlug: {
+      type: String,
+      required: true
+    }
+  },
+  emits: ['focus', 'submit', 'update:model-value', 'attached'],
+  data () {
+    return {
+      isCreatingCheckout: false
+    }
+  },
+  computed: {
+    queryParams () {
+      return new URLSearchParams(window.location.search)
+    },
+    sessionId () {
+      return this.queryParams.get('stripe_session_id')
+    },
+    defaultName () {
+      const { price, currency } = this.field.preferences || {}
+
+      const formattedPrice = new Intl.NumberFormat([], {
+        style: 'currency',
+        currency
+      }).format(price)
+
+      return `Pay ${formattedPrice}`
+    }
+  },
+  mounted () {
+    if (this.sessionId) {
+      this.$emit('submit')
+    }
+  },
+  methods: {
+    async submit () {
+      if (this.sessionId) {
+        return fetch((this.baseUrl || '/embed').replace('/embed', '/api/stripe_payments/' + this.sessionId), {
+          method: 'PUT',
+          body: JSON.stringify({
+            submitter_slug: this.submitterSlug
+          }),
+          headers: { 'Content-Type': 'application/json' }
+        }).then(async (resp) => {
+          if (resp.status === 422 || resp.status === 500) {
+            const data = await resp.json()
+
+            alert(data.error || 'Unexpected error')
+
+            return Promise.reject(new Error(data.error))
+          }
+
+          const attachment = await resp.json()
+
+          window.history.replaceState({}, document.title, window.location.pathname)
+
+          this.$emit('update:model-value', attachment.uuid)
+          this.$emit('attached', attachment)
+
+          return resp
+        })
+      } else {
+        return Promise.resolve({})
+      }
+    },
+    startCheckout () {
+      this.isCreatingCheckout = true
+
+      fetch((this.baseUrl || '/embed').replace('/embed', '/api/stripe_payments'), {
+        method: 'POST',
+        body: JSON.stringify({
+          submitter_slug: this.submitterSlug,
+          field_uuid: this.field.uuid
+        }),
+        headers: { 'Content-Type': 'application/json' }
+      }).then(async (resp) => {
+        if (resp.status === 422 || resp.status === 500) {
+          const data = await resp.json()
+
+          alert(data.message || 'Unexpected error')
+
+          return Promise.reject(new Error(data.message))
+        }
+
+        const { url } = await resp.json()
+
+        const link = document.createElement('a')
+
+        link.href = url
+
+        if (url) {
+          link.click()
+        }
+      }).finally(() => {
+        this.isCreatingCheckout = false
+      })
+    }
+  }
+}
+</script>

app/javascript/template_builder/area.vue

@@ -218,30 +218,30 @@ export default {
     },
     borderColors () {
       return [
-        'border-red-500/50',
+        'border-red-500/80',
-        'border-sky-500/50',
+        'border-sky-500/80',
-        'border-emerald-500/50',
+        'border-emerald-500/80',
-        'border-yellow-300/50',
+        'border-yellow-300/80',
-        'border-purple-600/50',
+        'border-purple-600/80',
-        'border-pink-500/50',
+        'border-pink-500/80',
-        'border-cyan-500/50',
+        'border-cyan-500/80',
-        'border-orange-500/50',
+        'border-orange-500/80',
-        'border-lime-500/50',
+        'border-lime-500/80',
-        'border-indigo-500/50'
+        'border-indigo-500/80'
       ]
     },
     bgColors () {
       return [
-        'bg-red-100/50',
+        'bg-red-100/80',
-        'bg-sky-100/50',
+        'bg-sky-100/80',
-        'bg-emerald-100/50',
+        'bg-emerald-100/80',
-        'bg-yellow-100/50',
+        'bg-yellow-100/80',
-        'bg-purple-100/50',
+        'bg-purple-100/80',
-        'bg-pink-100/50',
+        'bg-pink-100/80',
-        'bg-cyan-100/50',
+        'bg-cyan-100/80',
-        'bg-orange-100/50',
+        'bg-orange-100/80',
-        'bg-lime-100/50',
+        'bg-lime-100/80',
-        'bg-indigo-100/50'
+        'bg-indigo-100/80'
       ]
     },
     isSelected () {

app/javascript/template_builder/builder.vue

@@ -5,7 +5,8 @@
   >
     <div
       v-if="$slots.buttons || withTitle"
-      class="flex justify-between py-1.5 items-center pr-4 sticky top-0 z-10"
+      class="flex justify-between py-1.5 items-center pr-4 top-0 z-10"
+      :class="{ sticky: withStickySubmitters || isBreakpointLg }"
       :style="{ backgroundColor }"
     >
       <div class="flex items-center space-x-3">
@@ -86,6 +87,7 @@
       :class="$slots.buttons || withTitle ? 'md:max-h-[calc(100%_-_60px)]' : 'md:max-h-[100%]'"
     >
       <div
+        v-if="withDocumentsList"
         ref="previews"
         :style="{ 'display': isBreakpointLg ? 'none' : 'initial' }"
         class="overflow-y-auto overflow-x-hidden w-52 flex-none pr-3 mt-0.5 pt-0.5 hidden lg:block"
@@ -192,36 +194,22 @@
           @cancel="[drawField = null, drawOption = null]"
           @change-submitter="[selectedSubmitter = $event, drawField.submitter_uuid = $event.uuid]"
         />
-        <FieldType
+        <MobileFields
           v-if="sortedDocuments.length && !drawField && editable"
-          class="dropdown-top dropdown-end fixed bottom-4 right-4 z-10 md:hidden"
+          :fields="template.fields"
-          :model-value="''"
+          :default-fields="defaultFields"
-          @update:model-value="startFieldDraw($event)"
+          :selected-submitter="selectedSubmitter"
-        >
+          @select="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
+        v-if="withFieldsList"
         class="relative w-80 flex-none mt-1 pr-4 pl-0.5 hidden md:block"
-        :class="drawField ? 'overflow-hidden' : 'overflow-auto'"
+        :class="drawField ? 'overflow-hidden' : 'overflow-y-auto overflow-x-hidden'"
       >
         <div
           v-if="drawField"
-          class="sticky inset-0 h-full"
+          class="sticky inset-0 h-full z-20"
           :style="{ backgroundColor }"
         >
           <div class="bg-base-300 rounded-lg p-5 text-center space-y-4">
@@ -244,6 +232,7 @@
             :fields="template.fields"
             :submitters="template.submitters"
             :selected-submitter="selectedSubmitter"
+            :default-submitters="defaultSubmitters"
             :default-fields="defaultFields"
             :with-sticky-submitters="withStickySubmitters"
             :editable="editable"
@@ -269,8 +258,8 @@ import Logo from './logo'
 import Contenteditable from './contenteditable'
 import DocumentPreview from './preview'
 import DocumentControls from './controls'
-import FieldType from './field_type'
+import MobileFields from './mobile_fields'
-import { IconUsersPlus, IconDeviceFloppy, IconWritingSign, IconInnerShadowTop, IconPlus, IconX } from '@tabler/icons-vue'
+import { IconUsersPlus, IconDeviceFloppy, IconWritingSign, IconInnerShadowTop } from '@tabler/icons-vue'
 import { v4 } from 'uuid'
 import { ref, computed } from 'vue'
 
@@ -281,10 +270,8 @@ export default {
     Document,
     Fields,
     MobileDrawField,
-    IconPlus,
-    FieldType,
-    IconX,
     IconWritingSign,
+    MobileFields,
     Logo,
     Dropzone,
     DocumentPreview,
@@ -301,6 +288,7 @@ export default {
       baseFetch: this.baseFetch,
       backgroundColor: this.backgroundColor,
       withPhone: this.withPhone,
+      withPayment: this.withPayment,
       selectedAreaRef: computed(() => this.selectedAreaRef)
     }
   },
@@ -349,6 +337,13 @@ export default {
       required: false,
       default: true
     },
+    onUpload: {
+      type: Function,
+      required: false,
+      default () {
+        return () => {}
+      }
+    },
     withStickySubmitters: {
       type: Boolean,
       required: false,
@@ -364,11 +359,26 @@ export default {
       required: false,
       default: true
     },
+    withFieldsList: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    withDocumentsList: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     withPhone: {
       type: Boolean,
       required: false,
       default: false
     },
+    withPayment: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     fetchOptions: {
       type: Object,
       required: false,
@@ -387,8 +397,6 @@ export default {
     }
   },
   computed: {
-    fieldIcons: FieldType.computed.fieldIcons,
-    fieldNames: FieldType.computed.fieldNames,
     selectedAreaRef: () => ref(),
     fieldAreasIndex () {
       const areas = {}
@@ -415,11 +423,20 @@ export default {
     }
   },
   created () {
+    const existingSubmittersUuids = this.defaultSubmitters.map((name) => {
+      return this.template.submitters.find(e => e.name === name)?.uuid
+    })
+
     this.defaultSubmitters.forEach((name, index) => {
       const submitter = (this.template.submitters[index] ||= {})
 
       submitter.name = name
-      submitter.uuid ||= v4()
+
+      if (existingSubmittersUuids.filter(Boolean).length) {
+        submitter.uuid = existingSubmittersUuids[index] || v4()
+      } else {
+        submitter.uuid ||= v4()
+      }
     })
 
     this.selectedSubmitter = this.template.submitters[0]
@@ -436,6 +453,12 @@ export default {
     window.addEventListener('keydown', this.onKeyDown)
 
     window.addEventListener('resize', this.onWindowResize)
+
+    this.$nextTick(() => {
+      if (document.location.search?.includes('stripe_connect_success')) {
+        document.querySelector('form[action="/auth/stripe_connect"]')?.closest('.dropdown')?.querySelector('label')?.focus()
+      }
+    })
   },
   unmounted () {
     document.removeEventListener('keyup', this.onKeyUp)
@@ -447,21 +470,38 @@ export default {
     this.documentRefs = []
   },
   methods: {
-    startFieldDraw (type) {
+    startFieldDraw ({ name, type }) {
-      const field = {
+      const existingField = this.template.fields?.find((f) => f.submitter_uuid === this.selectedSubmitter.uuid && name && name === f.name)
-        name: '',
+
-        uuid: v4(),
+      if (existingField) {
-        required: type !== 'checkbox',
+        this.drawField = existingField
-        areas: [],
+      } else {
-        submitter_uuid: this.selectedSubmitter.uuid,
+        const field = {
-        type
+          name: name || '',
+          uuid: v4(),
+          required: type !== 'checkbox',
+          areas: [],
+          submitter_uuid: this.selectedSubmitter.uuid,
+          type
+        }
+
+        if (['select', 'multiple', 'radio'].includes(type)) {
+          field.options = [{ value: '', uuid: v4() }]
+        }
+
+        if (type === 'stamp') {
+          field.readonly = true
+        }
+
+        if (type === 'date') {
+          field.preferences = {
+            format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+          }
+        }
+
+        this.drawField = field
       }
 
-      if (['select', 'multiple', 'radio'].includes(type)) {
-        field.options = [{ value: '', uuid: v4() }]
-      }
-
-      this.drawField = field
       this.drawOption = null
     },
     undo () {
@@ -569,6 +609,41 @@ export default {
           area.option_uuid = this.drawOption.uuid
         }
 
+        if (area.w === 0 || area.h === 0) {
+          const previousArea = this.drawField.areas?.[this.drawField.areas.length - 1]
+
+          if (this.selectedField?.type === this.drawField.type) {
+            area.w = this.selectedAreaRef.value.w
+            area.h = this.selectedAreaRef.value.h
+          } else if (previousArea) {
+            area.w = previousArea.w
+            area.h = previousArea.h
+          } else {
+            const documentRef = this.documentRefs.find((e) => e.document.uuid === area.attachment_uuid)
+            const pageMask = documentRef.pageRefs[area.page].$refs.mask
+
+            if (this.drawField.type === 'checkbox' || this.drawOption) {
+              area.w = pageMask.clientWidth / 30 / pageMask.clientWidth
+              area.h = (pageMask.clientWidth / 30 / pageMask.clientWidth) * (pageMask.clientWidth / pageMask.clientHeight)
+            } else if (this.drawField.type === 'image') {
+              area.w = pageMask.clientWidth / 5 / pageMask.clientWidth
+              area.h = (pageMask.clientWidth / 5 / pageMask.clientWidth) * (pageMask.clientWidth / pageMask.clientHeight)
+            } else if (this.drawField.type === 'signature' || this.drawField.type === 'stamp') {
+              area.w = pageMask.clientWidth / 5 / pageMask.clientWidth
+              area.h = (pageMask.clientWidth / 5 / pageMask.clientWidth) * (pageMask.clientWidth / pageMask.clientHeight) / 2
+            } else if (this.drawField.type === 'initials') {
+              area.w = pageMask.clientWidth / 10 / pageMask.clientWidth
+              area.h = (pageMask.clientWidth / 35 / pageMask.clientWidth)
+            } else {
+              area.w = pageMask.clientWidth / 5 / pageMask.clientWidth
+              area.h = (pageMask.clientWidth / 35 / pageMask.clientWidth)
+            }
+          }
+
+          area.x -= area.w / 2
+          area.y -= area.h / 2
+        }
+
         this.drawField.areas ||= []
         this.drawField.areas.push(area)
 
@@ -637,6 +712,16 @@ export default {
         field.options = [{ value: '', uuid: v4() }]
       }
 
+      if (field.type === 'stamp') {
+        field.readonly = true
+      }
+
+      if (field.type === 'date') {
+        field.preferences = {
+          format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+        }
+      }
+
       const fieldArea = {
         x: (area.x - 6) / area.maskW,
         y: area.y / area.maskH,
@@ -663,7 +748,7 @@ export default {
             w: area.maskW / 5 / area.maskW,
             h: (area.maskW / 5 / area.maskW) * (area.maskW / area.maskH)
           }
-        } else if (field.type === 'signature') {
+        } else if (field.type === 'signature' || field.type === 'stamp') {
           baseArea = {
             w: area.maskW / 5 / area.maskW,
             h: (area.maskW / 5 / area.maskW) * (area.maskW / area.maskH) / 2
@@ -707,6 +792,14 @@ export default {
         this.scrollIntoDocument(schema[0])
       })
 
+      if (this.template.name === 'New Document') {
+        this.template.name = this.template.schema[0].name
+      }
+
+      if (this.onUpload) {
+        this.onUpload(this.template)
+      }
+
       this.save()
     },
     updateName (value) {
@@ -740,6 +833,10 @@ export default {
         })
       })
 
+      if (this.onUpload) {
+        this.onUpload(this.template)
+      }
+
       this.save()
     },
     moveDocument (item, direction) {
@@ -791,9 +888,11 @@ export default {
       })
     },
     save () {
-      if (this.$el.closest('template-builder')) {
+      this.$nextTick(() => {
-        this.$el.closest('template-builder').dataset.template = JSON.stringify(this.template)
+        if (this.$el.closest('template-builder')) {
-      }
+          this.$el.closest('template-builder').dataset.template = JSON.stringify(this.template)
+        }
+      })
 
       this.pushUndo()
 

app/javascript/template_builder/field.vue

@@ -65,9 +65,15 @@
               :stroke-width="1.6"
             />
           </button>
+          <PaymentSettings
+            v-if="field.type === 'payment'"
+            :field="field"
+          />
           <span
-            v-if="!defaultField"
+            v-else
             class="dropdown dropdown-end"
+            @mouseenter="renderDropdown = true"
+            @touchstart="renderDropdown = true"
           >
             <label
               tabindex="0"
@@ -80,6 +86,7 @@
               />
             </label>
             <ul
+              v-if="renderDropdown"
               tabindex="0"
               class="mt-1.5 dropdown-content menu menu-xs p-2 shadow bg-base-100 rounded-box w-52 z-10"
               draggable="true"
@@ -87,7 +94,7 @@
               @click="closeDropdown"
             >
               <div
-                v-if="field.type === 'text'"
+                v-if="field.type === 'text' && !defaultField"
                 class="py-1.5 px-1 relative"
                 @click.stop
               >
@@ -107,6 +114,33 @@
                   Default value
                 </label>
               </div>
+              <div
+                v-if="field.type === 'date'"
+                class="py-1.5 px-1 relative"
+                @click.stop
+              >
+                <select
+                  v-model="field.preferences.format"
+                  placeholder="Format"
+                  class="select select-bordered select-xs font-normal w-full max-w-xs !h-7 !outline-0"
+                  @change="save"
+                >
+                  <option
+                    v-for="format in dateFormats"
+                    :key="format"
+                    :value="format"
+                  >
+                    {{ formatDate(new Date(), format) }}
+                  </option>
+                </select>
+                <label
+                  :style="{ backgroundColor: backgroundColor }"
+                  class="absolute -top-1 left-2.5 px-1 h-4"
+                  style="font-size: 8px"
+                >
+                  Format
+                </label>
+              </div>
               <li
                 v-if="field.type != 'phone'"
                 @click.stop
@@ -122,7 +156,7 @@
                 </label>
               </li>
               <li
-                v-if="field.type === 'text'"
+                v-if="field.type === 'text' && !defaultField"
                 @click.stop
               >
                 <label class="cursor-pointer py-1.5">
@@ -216,6 +250,7 @@
               class="w-full input input-primary input-xs text-sm bg-transparent !pr-7 -mr-6"
               type="text"
               required
+              :placeholder="`Option ${index + 1}`"
               @blur="save"
             >
             <button
@@ -233,6 +268,7 @@
             v-else
             v-model="option.value"
             class="w-full input input-primary input-xs text-sm bg-transparent"
+            :placeholder="`Option ${index + 1}`"
             type="text"
             required
             @focus="maybeFocusOnOptionArea(option)"
@@ -261,6 +297,7 @@
 <script>
 import Contenteditable from './contenteditable'
 import FieldType from './field_type'
+import PaymentSettings from './payment_settings'
 import { IconShape, IconNewSection, IconTrashX, IconCopy, IconSettings } from '@tabler/icons-vue'
 import { v4 } from 'uuid'
 
@@ -270,6 +307,7 @@ export default {
     Contenteditable,
     IconSettings,
     IconShape,
+    PaymentSettings,
     IconNewSection,
     IconTrashX,
     IconCopy,
@@ -295,23 +333,86 @@ export default {
   emits: ['set-draw', 'remove', 'scroll-to'],
   data () {
     return {
-      isNameFocus: false
+      isNameFocus: false,
+      showPaymentModal: false,
+      renderDropdown: false
     }
   },
   computed: {
     fieldNames: FieldType.computed.fieldNames,
+    dateFormats () {
+      return [
+        'MM/DD/YYYY',
+        'DD/MM/YYYY',
+        'YYYY-MM-DD',
+        'DD-MM-YYYY',
+        'DD.MM.YYYY',
+        'MMM D, YYYY',
+        'MMMM D, YYYY',
+        'D MMM YYYY',
+        'D MMMM YYYY'
+      ]
+    },
     defaultName () {
-      const typeIndex = this.template.fields.filter((f) => f.type === this.field.type).indexOf(this.field)
+      if (this.field.type === 'payment' && this.field.preferences?.price) {
+        const { price, currency } = this.field.preferences || {}
 
-      const suffix = { multiple: 'Select', radio: 'Group' }[this.field.type] || 'Field'
+        const formattedPrice = new Intl.NumberFormat([], {
+          style: 'currency',
+          currency
+        }).format(price)
 
-      return `${this.fieldNames[this.field.type]} ${suffix} ${typeIndex + 1}`
+        return `${this.fieldNames[this.field.type]} ${formattedPrice}`
+      } else {
+        const typeIndex = this.template.fields.filter((f) => f.type === this.field.type).indexOf(this.field)
+
+        const suffix = { multiple: 'Select', radio: 'Group' }[this.field.type] || 'Field'
+
+        return `${this.fieldNames[this.field.type]} ${suffix} ${typeIndex + 1}`
+      }
     },
     areas () {
       return this.field.areas || []
     }
   },
+  created () {
+    this.field.preferences ||= {}
+
+    if (this.field.type === 'date') {
+      this.field.preferences.format ||=
+        (Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY')
+    }
+  },
   methods: {
+    formatDate (date, format) {
+      const monthFormats = {
+        M: 'numeric',
+        MM: '2-digit',
+        MMM: 'short',
+        MMMM: 'long'
+      }
+
+      const dayFormats = {
+        D: 'numeric',
+        DD: '2-digit'
+      }
+
+      const yearFormats = {
+        YYYY: 'numeric',
+        YY: '2-digit'
+      }
+
+      const parts = new Intl.DateTimeFormat([], {
+        day: dayFormats[format.match(/D+/)],
+        month: monthFormats[format.match(/M+/)],
+        year: yearFormats[format.match(/Y+/)]
+      }).formatToParts(date)
+
+      return format
+        .replace(/D+/, parts.find((p) => p.type === 'day').value)
+        .replace(/M+/, parts.find((p) => p.type === 'month').value)
+        .replace(/Y+/, parts.find((p) => p.type === 'year').value)
+    },
     copyToAllPages (field) {
       const areaString = JSON.stringify(field.areas[0])
 

app/javascript/template_builder/field_submitter.vue

@@ -1,5 +1,9 @@
 <template>
-  <div v-if="mobileView">
+  <div
+    v-if="mobileView"
+    @mouseenter="renderDropdown = true"
+    @touchstart="renderDropdown = true"
+  >
     <div class="flex space-x-2 items-end">
       <div class="group/contenteditable-container bg-base-100 rounded-md p-2 border border-base-300 w-full flex justify-between items-end">
         <div class="flex items-center space-x-2">
@@ -29,7 +33,7 @@
           />
         </label>
         <ul
-          v-if="editable"
+          v-if="editable && renderDropdown"
           tabindex="0"
           class="rounded-md min-w-max mb-2"
           :class="menuClasses"
@@ -85,6 +89,8 @@
   <div
     v-else
     class="dropdown"
+    @mouseenter="renderDropdown = true"
+    @touchstart="renderDropdown = true"
   >
     <label
       v-if="compact"
@@ -125,7 +131,7 @@
       </span>
     </label>
     <ul
-      v-if="editable || !compact"
+      v-if="(editable || !compact) && renderDropdown"
       tabindex="0"
       :class="menuClasses"
       @click="closeDropdown"
@@ -222,6 +228,11 @@ export default {
     }
   },
   emits: ['update:model-value', 'remove', 'new-submitter', 'name-change'],
+  data () {
+    return {
+      renderDropdown: false
+    }
+  },
   computed: {
     colors () {
       return [

app/javascript/template_builder/field_type.vue

@@ -1,5 +1,9 @@
 <template>
-  <span class="dropdown">
+  <span
+    class="dropdown"
+    @mouseenter="renderDropdown = true"
+    @touchstart="renderDropdown = true"
+  >
     <slot>
       <label
         tabindex="0"
@@ -15,7 +19,7 @@
       </label>
     </slot>
     <ul
-      v-if="editable"
+      v-if="editable && renderDropdown"
       tabindex="0"
       class="dropdown-content menu menu-xs p-2 shadow rounded-box w-52 z-10 mb-3"
       :class="menuClasses"
@@ -25,7 +29,7 @@
         v-for="(icon, type) in fieldIcons"
         :key="type"
       >
-        <li v-if="withPhone || type !== 'phone'">
+        <li v-if="(withPhone || type != 'phone') && (withPayment || type != 'payment')">
           <a
             href="#"
             class="text-sm py-1 px-2"
@@ -46,11 +50,11 @@
 </template>
 
 <script>
-import { IconTextSize, IconWritingSign, IconCalendarEvent, IconPhoto, IconCheckbox, IconPaperclip, IconSelect, IconCircleDot, IconChecks, IconColumns3, IconPhoneCheck, IconLetterCaseUpper } from '@tabler/icons-vue'
+import { IconTextSize, IconWritingSign, IconCalendarEvent, IconPhoto, IconCheckbox, IconPaperclip, IconSelect, IconCircleDot, IconChecks, IconColumns3, IconPhoneCheck, IconLetterCaseUpper, IconCreditCard, IconRubberStamp } from '@tabler/icons-vue'
 
 export default {
   name: 'FiledTypeDropdown',
-  inject: ['withPhone'],
+  inject: ['withPhone', 'withPayment'],
   props: {
     modelValue: {
       type: String,
@@ -78,6 +82,11 @@ export default {
     }
   },
   emits: ['update:model-value'],
+  data () {
+    return {
+      renderDropdown: false
+    }
+  },
   computed: {
     fieldNames () {
       return {
@@ -92,6 +101,8 @@ export default {
         multiple: 'Multiple',
         radio: 'Radio',
         cells: 'Cells',
+        stamp: 'Stamp',
+        payment: 'Payment',
         phone: 'Phone'
       }
     },
@@ -103,11 +114,13 @@ export default {
         date: IconCalendarEvent,
         image: IconPhoto,
         file: IconPaperclip,
-        select: IconSelect,
         checkbox: IconCheckbox,
         radio: IconCircleDot,
+        select: IconSelect,
         multiple: IconChecks,
         cells: IconColumns3,
+        stamp: IconRubberStamp,
+        payment: IconCreditCard,
         phone: IconPhoneCheck
       }
     }

app/javascript/template_builder/fields.vue

@@ -5,7 +5,7 @@
       class="w-full rounded-lg"
       :class="{ 'bg-base-100': withStickySubmitters }"
       :submitters="submitters"
-      :editable="editable"
+      :editable="editable && !defaultSubmitters.length"
       @new-submitter="save"
       @remove="removeSubmitter"
       @name-change="save"
@@ -13,9 +13,10 @@
     />
   </div>
   <div
+    ref="fields"
     class="mb-1 mt-2"
     @dragover.prevent="onFieldDragover"
-    @drop="save"
+    @drop="reorderFields"
   >
     <Field
       v-for="field in submitterFields"
@@ -23,7 +24,7 @@
       :data-uuid="field.uuid"
       :field="field"
       :type-index="fields.filter((f) => f.type === field.type).indexOf(field)"
-      :editable="editable && !dragField"
+      :editable="editable && (!dragField || dragField !== field)"
       :default-field="defaultFields.find((f) => f.name === field.name)"
       :draggable="editable"
       @dragstart="dragField = field"
@@ -71,7 +72,7 @@
       :key="type"
     >
       <button
-        v-if="withPhone || type != 'phone'"
+        v-if="(withPhone || type != 'phone') && (withPayment || type != 'payment')"
         draggable="true"
         class="group flex items-center justify-center border border-dashed border-base-300 hover:border-base-content/20 w-full rounded relative"
         :style="{ backgroundColor: backgroundColor }"
@@ -90,8 +91,9 @@
         </div>
       </button>
       <div
-        v-else
+        v-else-if="type == 'phone'"
-        class="tooltip tooltip-bottom-end flex"
+        class="tooltip tooltip-bottom flex"
+        :class="{'tooltip-bottom-start': !withPayment, 'tooltip-bottom': withPayment }"
         data-tip="Unlock SMS-verified phone number field with paid plan. Use text field for phone numbers without verification."
       >
         <a
@@ -152,7 +154,7 @@ export default {
     IconDrag,
     IconLock
   },
-  inject: ['save', 'backgroundColor', 'withPhone'],
+  inject: ['save', 'backgroundColor', 'withPhone', 'withPayment'],
   props: {
     fields: {
       type: Array,
@@ -168,6 +170,11 @@ export default {
       required: false,
       default: () => []
     },
+    defaultSubmitters: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
     withStickySubmitters: {
       type: Boolean,
       required: false,
@@ -205,23 +212,33 @@ export default {
       this.$emit('set-drag', field)
     },
     onFieldDragover (e) {
-      const targetFieldUuid = e.target.closest('[data-uuid]')?.dataset?.uuid
+      const targetField = e.target.closest('[data-uuid]')
+      const dragField = this.$refs.fields.querySelector(`[data-uuid="${this.dragField.uuid}"]`)
 
-      if (this.dragField && targetFieldUuid && this.dragField.uuid !== targetFieldUuid) {
+      if (dragField && targetField && targetField !== dragField) {
-        const field = this.fields.find((f) => f.uuid === targetFieldUuid)
+        const fields = Array.from(this.$refs.fields.children)
-
+        const currentIndex = fields.indexOf(dragField)
-        const currentIndex = this.fields.indexOf(this.dragField)
+        const targetIndex = fields.indexOf(targetField)
-        const targetIndex = this.fields.indexOf(field)
 
         if (currentIndex < targetIndex) {
-          this.fields.splice(targetIndex + 1, 0, this.dragField)
+          targetField.after(dragField)
-          this.fields.splice(currentIndex, 1)
         } else {
-          this.fields.splice(targetIndex, 0, this.dragField)
+          targetField.before(dragField)
-          this.fields.splice(currentIndex + 1, 1)
         }
       }
     },
+    reorderFields () {
+      Array.from(this.$refs.fields.children).forEach((el, index) => {
+        if (el.dataset.uuid !== this.fields[index].uuid) {
+          const field = this.fields.find((f) => f.uuid === el.dataset.uuid)
+
+          this.fields.splice(this.fields.indexOf(field), 1)
+          this.fields.splice(index, 0, field)
+        }
+      })
+
+      this.save()
+    },
     removeSubmitter (submitter) {
       [...this.fields].forEach((field) => {
         if (field.submitter_uuid === submitter.uuid) {
@@ -256,9 +273,19 @@ export default {
         field.options = [{ value: '', uuid: v4() }]
       }
 
+      if (type === 'stamp') {
+        field.readonly = true
+      }
+
+      if (type === 'date') {
+        field.preferences = {
+          format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+        }
+      }
+
       this.fields.push(field)
 
-      if (['signature', 'initials', 'cells'].includes(type)) {
+      if (['signature', 'initials', 'cells', 'stamp'].includes(type)) {
         this.$emit('set-draw', { field })
       }
 

app/javascript/template_builder/mobile_fields.vue

@@ -0,0 +1,121 @@
+<template>
+  <span
+    class="dropdown dropdown-top dropdown-end fixed bottom-4 right-4 z-10 md:hidden"
+  >
+    <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>
+    <ul
+      tabindex="0"
+      class="dropdown-content menu menu-xs p-2 shadow rounded-box w-52 z-10 mb-3 mt-1.5 bg-base-100"
+      @click="closeDropdown"
+    >
+      <template v-if="submitterDefaultFields.length">
+        <template
+          v-for="field in submitterDefaultFields"
+          :key="field.name"
+        >
+          <li>
+            <a
+              href="#"
+              class="text-sm py-1 px-2"
+              @click.prevent="$emit('select', { name: field.name || '', type: field.type || 'text' })"
+            >
+              <component
+                :is="fieldIcons[field.type || 'text']"
+                :stroke-width="1.6"
+                :width="20"
+              />
+              {{ field.name }}
+            </a>
+          </li>
+        </template>
+      </template>
+      <template v-else>
+        <template
+          v-for="(icon, type) in fieldIcons"
+          :key="type"
+        >
+          <li v-if="(withPhone || type != 'phone') && (withPayment || type != 'payment')">
+            <a
+              href="#"
+              class="text-sm py-1 px-2"
+              :class="{ 'active': type === modelValue }"
+              @click.prevent="$emit('select', { type })"
+            >
+              <component
+                :is="icon"
+                :stroke-width="1.6"
+                :width="20"
+              />
+              {{ fieldNames[type] }}
+            </a>
+          </li>
+        </template>
+      </template>
+    </ul>
+  </span>
+</template>
+<script>
+import { IconPlus, IconX } from '@tabler/icons-vue'
+import FieldType from './field_type'
+
+export default {
+  name: 'MobileFields',
+  components: {
+    IconPlus,
+    IconX
+  },
+  inject: ['withPhone', 'withPayment', 'backgroundColor'],
+  props: {
+    modelValue: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    fields: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
+    selectedSubmitter: {
+      type: Object,
+      required: true
+    },
+    defaultFields: {
+      type: Array,
+      required: false,
+      default: () => []
+    }
+  },
+  emits: ['select'],
+  computed: {
+    ...FieldType.computed,
+    submitterFields () {
+      return this.fields.filter((f) => f.submitter_uuid === this.selectedSubmitter.uuid)
+    },
+    submitterDefaultFields () {
+      return this.defaultFields.filter((f) => {
+        return (!f.role || f.role === this.selectedSubmitter.name)
+      })
+    }
+  },
+  methods: {
+    closeDropdown () {
+      document.activeElement.blur()
+    }
+  }
+}
+</script>

app/javascript/template_builder/payment_settings.vue

@@ -0,0 +1,244 @@
+<template>
+  <span
+    class="dropdown dropdown-end"
+    :class="{ 'dropdown-open': (!field.preferences?.price || !isConnected) && !isLoading }"
+  >
+    <label
+      tabindex="0"
+      title="Settings"
+      class="cursor-pointer text-transparent group-hover:text-base-content"
+    >
+      <IconSettings
+        :width="18"
+        :stroke-width="1.6"
+      />
+    </label>
+    <ul
+      tabindex="0"
+      class="mt-1.5 dropdown-content menu menu-xs p-2 shadow bg-base-100 rounded-box w-52 z-10"
+      draggable="true"
+      @dragstart.prevent.stop
+      @click="closeDropdown"
+    >
+      <div
+        class="py-1.5 px-1 relative"
+        @click.stop
+      >
+        <select
+          v-model="field.preferences.currency"
+          placeholder="Price"
+          class="select select-bordered select-xs font-normal w-full max-w-xs !h-7 !outline-0"
+          @change="save"
+        >
+          <option
+            v-for="currency in currencies"
+            :key="currency"
+            :value="currency"
+          >
+            {{ currency }}
+          </option>
+        </select>
+        <label
+          :style="{ backgroundColor: backgroundColor }"
+          class="absolute -top-1 left-2.5 px-1 h-4"
+          style="font-size: 8px"
+        >
+          Currency
+        </label>
+      </div>
+      <div
+        class="py-1.5 px-1 relative"
+        @click.stop
+      >
+        <input
+          v-model="field.preferences.price"
+          type="number"
+          placeholder="Price"
+          class="input input-bordered input-xs w-full max-w-xs h-7 !outline-0"
+          @blur="save"
+        >
+        <label
+          v-if="field.preferences.price"
+          :style="{ backgroundColor: backgroundColor }"
+          class="absolute -top-1 left-2.5 px-1 h-4"
+          style="font-size: 8px"
+        >
+          Price
+        </label>
+      </div>
+      <div
+        v-if="!isConnected || isOauthSuccess"
+        class="py-1.5 px-1 relative"
+        @click.stop
+      >
+        <div
+          v-if="isConnected && isOauthSuccess"
+          class="text-sm text-center"
+        >
+          <IconCircleCheck
+            class="inline text-green-600 w-4 h-4"
+          />
+          Stripe Connected
+        </div>
+        <form
+          v-if="!isConnected"
+          data-turbo="false"
+          action="/auth/stripe_connect"
+          accept-charset="UTF-8"
+          target="_blank"
+          method="post"
+        >
+          <input
+            type="hidden"
+            name="state"
+            :value="oauthState"
+            autocomplete="off"
+          >
+          <input
+            type="hidden"
+            name="redirect_uri"
+            :value="redirectUri"
+            autocomplete="off"
+          >
+          <input
+            type="hidden"
+            name="scope"
+            value="read_write"
+            autocomplete="off"
+          >
+          <input
+            type="hidden"
+            name="authenticity_token"
+            :value="authenticityToken"
+            autocomplete="off"
+          >
+          <button
+            type="submit"
+            :disabled="isLoading"
+            class="btn bg-[#7B73FF] hover:bg-[#0A2540] btn-sm text-white w-full"
+          >
+            <span
+              v-if="isLoading"
+              class="flex items-center space-x-1"
+            >
+              <IconInnerShadowTop
+                class="w-4 h-4 animate-spin inline"
+              />
+              <span>
+                Connect Stripe
+              </span>
+            </span>
+            <span
+              v-else
+              class="flex items-center space-x-1"
+            >
+              <IconBrandStripe
+                class="w-4 h-4 inline"
+              />
+              <span>
+                Connect Stripe
+              </span>
+            </span>
+          </button>
+        </form>
+        <a
+          v-if="!isConnected"
+          class="block link text-center mt-1"
+          href="https://www.docuseal.co/blog/accept-payments-and-request-signatures-with-ease"
+          target="_blank"
+          data-turbo="false"
+        >Learn more</a>
+      </div>
+    </ul>
+  </span>
+</template>
+
+<script>
+import { IconSettings, IconCircleCheck, IconBrandStripe, IconInnerShadowTop } from '@tabler/icons-vue'
+import { ref } from 'vue'
+
+const isConnected = ref(false)
+
+export default {
+  name: 'PaymentSettings',
+  components: {
+    IconSettings,
+    IconCircleCheck,
+    IconInnerShadowTop,
+    IconBrandStripe
+  },
+  inject: ['backgroundColor', 'save'],
+  props: {
+    field: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      isLoading: false
+    }
+  },
+  computed: {
+    isConnected: () => isConnected.value,
+    isOauthSuccess () {
+      return document.location.search?.includes('stripe_connect_success')
+    },
+    redirectUri () {
+      return document.location.origin + '/auth/stripe_connect/callback'
+    },
+    currencies () {
+      return ['USD', 'EUR', 'GBP']
+    },
+    authenticityToken () {
+      return document.querySelector('meta[name="csrf-token"]')?.content
+    },
+    oauthState () {
+      const params = new URLSearchParams('')
+
+      params.set('redir', document.location.href)
+
+      return params.toString()
+    },
+    defaultCurrency () {
+      const userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone
+
+      if (userTimezone.startsWith('Europe')) {
+        return 'EUR'
+      } else if (userTimezone.includes('London') || userTimezone.includes('Belfast')) {
+        return 'GBP'
+      } else {
+        return 'USD'
+      }
+    }
+  },
+  created () {
+    this.field.preferences ||= {}
+  },
+  mounted () {
+    this.field.preferences.currency ||= this.defaultCurrency
+
+    if (!this.isConnected) {
+      this.checkStatus()
+    }
+  },
+  methods: {
+    checkStatus () {
+      this.isLoading = true
+
+      fetch('/api/stripe_connect').then(async (resp) => {
+        const { status } = await resp.json()
+
+        if (status === 'connected') {
+          isConnected.value = true
+        }
+      }).finally(() => {
+        this.isLoading = false
+      })
+    },
+    closeDropdown () {
+      document.activeElement.blur()
+    }
+  }
+}
+</script>

app/javascript/template_builder/preview.vue

@@ -67,6 +67,7 @@
       <Contenteditable
         :model-value="item.name"
         :icon-width="16"
+        :editable="editable"
         style="max-width: 95%"
         class="mx-auto"
         @update:model-value="onUpdateName"

app/mailers/submitter_mailer.rb

@@ -25,10 +25,12 @@ class SubmitterMailer < ApplicationMailer
         DEFAULT_INVITATION_SUBJECT
       end
 
-    mail(to: @submitter.friendly_name,
+    mail(
-         from: from_address_for_submitter(submitter),
+      to: @submitter.friendly_name,
-         subject:,
+      from: from_address_for_submitter(submitter),
-         reply_to: (submitter.submission.created_by_user || submitter.template.author)&.friendly_name)
+      subject:,
+      reply_to: (submitter.submission.created_by_user || submitter.template.author)&.friendly_name&.sub(/\+\w+@/, '@')
+    )
   end
 
   def completed_email(submitter, user, bcc: nil)
@@ -53,7 +55,7 @@ class SubmitterMailer < ApplicationMailer
       end
 
     mail(from: from_address_for_submitter(submitter),
-         to: user.friendly_name,
+         to: user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name,
          bcc:,
          subject:)
   end
@@ -98,7 +100,7 @@ class SubmitterMailer < ApplicationMailer
 
     attachments[submitter.submission.audit_trail.filename.to_s] = audit_trail_data if audit_trail_data
 
-    file_fields = submitter.submission.template_fields.select { |e| e['type'] == 'file' }
+    file_fields = submitter.submission.template_fields.select { |e| e['type'].in?(%w[file payment]) }
 
     if file_fields.pluck('submitter_uuid').uniq.size == 1
       storage_attachments =
@@ -125,6 +127,11 @@ class SubmitterMailer < ApplicationMailer
   end
 
   def from_address_for_submitter(submitter)
-    submitter.submission.created_by_user&.friendly_name || submitter.submission.template.author.friendly_name
+    if submitter.submission.source.in?(%w[api embed]) &&
+       (from_email = AccountConfig.find_by(account: submitter.account, key: 'integration_from_email')&.value.presence)
+      from_email
+    else
+      (submitter.submission.created_by_user || submitter.submission.template.author).friendly_name
+    end
   end
 end

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'
+  ESIGNING_PREFERENCE_KEY = 'esigning_preference'
 
   DEFAULT_VALUES = {
     SUBMITTER_INVITATION_EMAIL_KEY => {
@@ -59,5 +60,5 @@ class AccountConfig < ApplicationRecord
 
   belongs_to :account
 
-  serialize :value, JSON
+  serialize :value, coder: JSON
 end

app/models/encrypted_config.rb

@@ -34,5 +34,5 @@ class EncryptedConfig < ApplicationRecord
 
   encrypts :value
 
-  serialize :value, JSON
+  serialize :value, coder: JSON
 end

app/models/encrypted_user_config.rb

@@ -25,5 +25,5 @@ class EncryptedUserConfig < ApplicationRecord
 
   encrypts :value
 
-  serialize :value, JSON
+  serialize :value, coder: JSON
 end

app/models/submission.rb

@@ -5,7 +5,7 @@
 # Table name: submissions
 #
 #  id                  :bigint           not null, primary key
-#  deleted_at          :datetime
+#  archived_at         :datetime
 #  preferences         :text             not null
 #  slug                :string           not null
 #  source              :text             not null
@@ -39,10 +39,10 @@ class Submission < ApplicationRecord
 
   attribute :preferences, :string, default: -> { {} }
 
-  serialize :template_fields, JSON
+  serialize :template_fields, coder: JSON
-  serialize :template_schema, JSON
+  serialize :template_schema, coder: JSON
-  serialize :template_submitters, JSON
+  serialize :template_submitters, coder: JSON
-  serialize :preferences, JSON
+  serialize :preferences, coder: JSON
 
   attribute :source, :string, default: 'link'
   attribute :submitters_order, :string, default: 'random'
@@ -55,7 +55,7 @@ class Submission < ApplicationRecord
            ->(e) { where(uuid: (e.template_schema.presence || e.template.schema).pluck('attachment_uuid')) },
            through: :template, source: :documents_attachments
 
-  scope :active, -> { where(deleted_at: nil) }
+  scope :active, -> { where(archived_at: nil) }
   scope :pending, -> { joins(:submitters).where(submitters: { completed_at: nil }).distinct }
   scope :completed, -> { where.not(id: pending.select(:submission_id)) }
 

app/models/submission_event.rb

@@ -31,7 +31,7 @@ class SubmissionEvent < ApplicationRecord
   attribute :data, :string, default: -> { {} }
   attribute :event_timestamp, :datetime, default: -> { Time.current }
 
-  serialize :data, JSON
+  serialize :data, coder: JSON
 
   before_validation :set_submission_id, on: :create
 

app/models/submitter.rb

@@ -41,8 +41,8 @@ class Submitter < ApplicationRecord
   attribute :preferences, :string, default: -> { {} }
   attribute :slug, :string, default: -> { SecureRandom.base58(14) }
 
-  serialize :values, JSON
+  serialize :values, coder: JSON
-  serialize :preferences, JSON
+  serialize :preferences, coder: JSON
 
   has_many_attached :documents
   has_many_attached :attachments

app/models/template.rb

@@ -6,7 +6,7 @@
 #
 #  id              :bigint           not null, primary key
 #  application_key :string
-#  deleted_at      :datetime
+#  archived_at     :datetime
 #  fields          :text             not null
 #  name            :string           not null
 #  schema          :text             not null
@@ -47,9 +47,9 @@ class Template < ApplicationRecord
   attribute :slug, :string, default: -> { SecureRandom.base58(14) }
   attribute :source, :string, default: 'native'
 
-  serialize :fields, JSON
+  serialize :fields, coder: JSON
-  serialize :schema, JSON
+  serialize :schema, coder: JSON
-  serialize :submitters, JSON
+  serialize :submitters, coder: JSON
 
   has_many_attached :documents
 
@@ -58,8 +58,8 @@ class Template < ApplicationRecord
 
   has_many :submissions, dependent: :destroy
 
-  scope :active, -> { where(deleted_at: nil) }
+  scope :active, -> { where(archived_at: nil) }
-  scope :archived, -> { where.not(deleted_at: nil) }
+  scope :archived, -> { where.not(archived_at: nil) }
 
   private
 

app/models/template_folder.rb

@@ -4,13 +4,13 @@
 #
 # Table name: template_folders
 #
-#  id         :bigint           not null, primary key
+#  id          :bigint           not null, primary key
-#  deleted_at :datetime
+#  archived_at :datetime
-#  name       :string           not null
+#  name        :string           not null
-#  created_at :datetime         not null
+#  created_at  :datetime         not null
-#  updated_at :datetime         not null
+#  updated_at  :datetime         not null
-#  account_id :bigint           not null
+#  account_id  :bigint           not null
-#  author_id  :bigint           not null
+#  author_id   :bigint           not null
 #
 # Indexes
 #
@@ -29,10 +29,10 @@ class TemplateFolder < ApplicationRecord
   belongs_to :account
 
   has_many :templates, dependent: :destroy, foreign_key: :folder_id, inverse_of: :folder
-  has_many :active_templates, -> { where(deleted_at: nil) },
+  has_many :active_templates, -> { where(archived_at: nil) },
            class_name: 'Template', dependent: :destroy, foreign_key: :folder_id, inverse_of: :folder
 
-  scope :active, -> { where(deleted_at: nil) }
+  scope :active, -> { where(archived_at: nil) }
 
   def default?
     name == DEFAULT_NAME

app/models/user.rb

@@ -5,10 +5,10 @@
 # Table name: users
 #
 #  id                     :bigint           not null, primary key
+#  archived_at            :datetime
 #  consumed_timestep      :integer
 #  current_sign_in_at     :datetime
 #  current_sign_in_ip     :string
-#  deleted_at             :datetime
 #  email                  :string           not null
 #  encrypted_password     :string           not null
 #  failed_attempts        :integer          default(0), not null
@@ -49,6 +49,8 @@ class User < ApplicationRecord
 
   EMAIL_REGEXP = /[^@;,<>\s]+@[^@;,<>\s]+/
 
+  has_one_attached :signature
+
   belongs_to :account
   has_one :access_token, dependent: :destroy
   has_many :templates, dependent: :destroy, foreign_key: :author_id, inverse_of: :author
@@ -59,14 +61,10 @@ class User < ApplicationRecord
 
   devise :two_factor_authenticatable, :recoverable, :rememberable, :validatable, :trackable
 
-  if Docuseal.multitenant?
-    devise :registerable, :omniauthable, omniauth_providers: %i[google_oauth2 microsoft_office365 github]
-  end
-
   attribute :role, :string, default: ADMIN_ROLE
   attribute :uuid, :string, default: -> { SecureRandom.uuid }
 
-  scope :active, -> { where(deleted_at: nil) }
+  scope :active, -> { where(archived_at: nil) }
   scope :admins, -> { where(role: ADMIN_ROLE) }
 
   def access_token
@@ -74,7 +72,7 @@ class User < ApplicationRecord
   end
 
   def active_for_authentication?
-    !deleted_at?
+    !archived_at?
   end
 
   def remember_me

app/models/user_config.rb

@@ -25,5 +25,5 @@ class UserConfig < ApplicationRecord
 
   belongs_to :user
 
-  serialize :value, JSON
+  serialize :value, coder: JSON
 end

app/views/dashboard/index.html.erb

@@ -16,7 +16,7 @@
     </div>
   </div>
   <% view_archived_html = capture do %>
-    <% if current_account.templates.where.not(deleted_at: nil).exists? %>
+    <% if current_account.templates.where.not(archived_at: nil).exists? %>
       <div>
         <a href="<%= templates_archived_index_path %>" class="link text-sm">View Archived</a>
       </div>

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

@@ -33,5 +33,6 @@
       <% end %>
     </div>
   <% end %>
+  <%= render 'extra_links' %>
   <%= render 'devise/shared/links' %>
 </div>

app/views/esign_settings/show.html.erb

@@ -121,7 +121,28 @@
             <%= f.button button_title(title: 'Save', disabled_with: 'Updating'), class: 'base-button' %>
           </div>
         <% end %>
+      </div>
+    <% end %>
+    <% if !Docuseal.multitenant? %>
+      <% account_config = AccountConfig.where(account: current_account, key: AccountConfig::ESIGNING_PREFERENCE_KEY).first_or_initialize(value: 'multiple') %>
+      <% if can?(:manage, account_config) %>
+        <div class="px-1 mt-8 max-w-xl">
+          <div class="flex justify-between items-end mb-4 mt-8">
+            <h2 class="text-3xl font-bold">Preferences</h2>
+          </div>
+          <% if can?(:manage, account_config) %>
+            <%= form_for account_config, url: account_configs_path, method: :post do |f| %>
+              <%= f.hidden_field :key %>
+              <div class="flex items-center justify-between py-2.5">
+                <span>
+                  Apply multiple PDF digital signatures in the document per each signer
+                </span>
+                <%= f.check_box :value, { class: 'toggle', checked: account_config.value == 'multiple', onchange: 'this.form.requestSubmit()' }, 'multiple', 'single' %>
+              </div>
+            <% end %>
+          <% end %>
+        </div>
       <% end %>
-    </div>
+    <% end %>
   </div>
 </div>

app/views/notifications_settings/index.html.erb

@@ -5,7 +5,7 @@
     <%= render 'email_stats' %>
     <%= render 'bcc_form', config: @bcc_config %>
     <div class="flex justify-between items-end mb-4 mt-8">
-      <h2 class="text-3xl font-bold">Signature Email Reminders</h2>
+      <h2 class="text-3xl font-bold">Sign Request Email Reminders</h2>
     </div>
     <%= render 'reminder_banner' %>
     <%= render 'reminder_form', config: @reminder_config %>

app/views/sso_settings/index.html.erb

@@ -1,7 +1,7 @@
 <div class="flex flex-wrap space-y-4 md:flex-nowrap md:space-y-0">
   <%= render 'shared/settings_nav' %>
   <div class="flex-grow max-w-xl mx-auto">
-    <h1 class="text-4xl font-bold mb-4">SMS</h1>
+    <h1 class="text-4xl font-bold mb-4">SAML SSO</h1>
     <%= render 'placeholder' %>
   </div>
   <div class="w-0 md:w-52"></div>

app/views/start_form/completed.html.erb

@@ -26,7 +26,7 @@
     <% end %>
     <% if @template.submitters.to_a.size == 1 %>
       <div>
-        <%= button_to button_title(title: 'Resubmit', disabled_with: 'Resubmit', icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: { email: params[:email] }, resubmit: true }, method: :put, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
+        <%= button_to button_title(title: 'Resubmit', disabled_with: 'Resubmit', icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: { email: params[:email] }, resubmit: @submitter.slug }, method: :put, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
       </div>
     <% end %>
   </div>

app/views/start_form/show.html.erb

@@ -3,7 +3,7 @@
     <div class="space-y-6">
       <div class="text-center w-full space-y-6">
         <%= render 'banner' %>
-        <% unless @template.deleted_at? %>
+        <% unless @template.archived_at? %>
           <p class="text-xl font-semibold text-center">You have been invited to submit a form</p>
         <% end %>
       </div>
@@ -14,7 +14,7 @@
           </div>
           <div>
             <p class="text-lg font-bold mb-1"><%= @template.name %></p>
-            <% if @template.deleted_at? %>
+            <% if @template.archived_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>
@@ -23,7 +23,7 @@
         </div>
       </div>
     </div>
-    <% unless @template.deleted_at? %>
+    <% unless @template.archived_at? %>
       <%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4', onsubmit: 'event.submitter.disabled = true' } do |f| %>
         <div class="form-control !mt-0">
           <%= f.label :email, class: 'label' %>

app/views/submissions/_value.html.erb

@@ -1,7 +1,7 @@
 <field-value class="flex absolute text-[1.5vw] lg:text-base" style="width: <%= area['w'] * 100 %>%; height: <%= area['h'] * 100 %>%; left: <%= area['x'] * 100 %>%; top: <%= area['y'] * 100 %>%">
-  <% if field['type'].in?(['signature', 'image', 'initials']) %>
+  <% if field['type'].in?(['signature', 'image', 'initials', 'stamp']) %>
     <img class="object-contain mx-auto" src="<%= attachments_index[value].url %>" loading="lazy">
-  <% elsif field['type'] == 'file' %>
+  <% elsif field['type'].in?(['file', 'payment']) %>
     <autosize-field></autosize-field>
     <div class="px-0.5 flex flex-col justify-center">
       <% Array.wrap(value).each do |val| %>
@@ -22,7 +22,7 @@
         <%= svg_icon('check', class: "aspect-square #{area['w'] > area['h'] ? '!w-auto !h-full' : '!w-full !h-auto'}") %>
       </div>
     <% end %>
-  <% elsif field['type'] == 'cells' %>
+  <% elsif field['type'] == 'cells' && area['cell_w'] %>
     <% cell_width = area['cell_w'] / area['w'] * 100 %>
     <div class="w-full flex items-center">
       <% (0..(area['w'] / area['cell_w']).ceil).each do |index| %>
@@ -34,7 +34,7 @@
   <% elsif field['type'] == 'date' %>
     <autosize-field></autosize-field>
     <div class="flex items-center px-0.5">
-      <%= l(Date.parse(value), format: :long, locale: local_assigns[:locale]) %>
+      <%= TimeUtils.format_date_string(value, field.dig('preferences', 'format'), local_assigns[:locale]) %>
     </div>
   <% else %>
     <autosize-field></autosize-field>

app/views/submissions/show.html.erb

@@ -146,9 +146,9 @@
                   <div class="w-full bg-base-300 py-1">
                     <img class="object-contain mx-auto" height="<%= attachments_index[value].metadata['height'] %>" width="<%= attachments_index[value].metadata['width'] %>" src="<%= attachments_index[value].url %>" loading="lazy">
                   </div>
-                <% elsif field['type'] == 'image' %>
+                <% elsif field['type'].in?(['image', 'stamp']) %>
                   <img class="object-contain mx-auto max-h-28" height="<%= attachments_index[value].metadata['height'] %>" width="<%= attachments_index[value].metadata['width'] %>" src="<%= attachments_index[value].url %>" loading="lazy">
-                <% elsif field['type'] == 'file' %>
+                <% elsif field['type'] == 'file' || field['type'] == 'payment' %>
                   <div class="flex flex-col justify-center">
                     <% Array.wrap(value).each do |val| %>
                       <a target="_blank" class="flex items-center space-x-1" href="<%= attachments_index[val].url %>">
@@ -162,7 +162,7 @@
                 <% elsif field['type'] == 'checkbox' %>
                   <%= svg_icon('check', class: 'w-6 h-6') %>
                 <% elsif field['type'] == 'date' %>
-                  <%= l(Date.parse(value), locale: @submission.template.account.locale, format: :long) %>
+                  <%= TimeUtils.format_date_string(value, field.dig('preferences', 'format'), @submission.template.account.locale) %>
                 <% else %>
                   <%= Array.wrap(value).join(', ') %>
                 <% 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-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-authenticity-token="<%= form_authenticity_token %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>"></submission-form>
+<submission-form data-is-demo="<%= Docuseal.demo? %>" 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

@@ -39,7 +39,7 @@
     <% if @submitter.submission.template.submitters.size == 1 %>
       <div class="divider">OR</div>
       <div>
-        <%= button_to button_title(title: 'Resubmit', disabled_with: '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: true }, method: :put, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
+        <%= button_to button_title(title: 'Resubmit', disabled_with: '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' %>
       </div>
     <% end %>
   </div>

app/views/submitter_mailer/invitation_email.html.erb

@@ -1,6 +1,7 @@
 <% if @email_config || @body.present? %>
-  <%= auto_link(simple_format(h(ReplaceEmailVariables.call(@body.presence || @email_config.value['body'], submitter: @submitter)))) %>
+  <% body = (@body.presence || @email_config.value['body']).to_s %>
-  <% if !(@body.presence || @email_config.value['body']).include?(ReplaceEmailVariables::SUBMITTER_LINK) %>
+  <%= auto_link(simple_format(h(ReplaceEmailVariables.call(body, submitter: @submitter)))) %>
+  <% if !body.include?(ReplaceEmailVariables::SUBMITTER_LINK) && !body.include?(ReplaceEmailVariables::SUBMITTER_ID) && !body.include?(ReplaceEmailVariables::SUBMISSION_LINK) && !body.include?(ReplaceEmailVariables::TEMPLATE_ID) %>
     <p><%= link_to nil, submit_form_url(slug: @submitter.slug, t: SubmissionEvents.build_tracking_param(@submitter, 'click_email')) %></p>
   <% end %>
 <% else %>

app/views/template_folders/show.html.erb

@@ -24,7 +24,7 @@
     <% end %>
     <% if can?(:create, ::Template) %>
       <%= render 'templates/upload_button', folder_name: @template_folder.name %>
-      <%= link_to new_template_path(folder_name: @template_folder.name), class: 'btn btn-primary text-base btn-md gap-2', data: { turbo_frame: :modal } do %>
+      <%= link_to new_template_path(folder_name: @template_folder.name), class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
         <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
         <span class="hidden md:block">Create</span>
       <% end %>

app/views/templates/_submission.html.erb

@@ -1,7 +1,7 @@
 <% status_badges = { 'awaiting' => 'badge-info', 'sent' => 'badge-info', 'completed' => 'badge-success', 'opened' => 'badge-warning' } %>
 <a href="<%= submission_path(submission) %>" class="bg-base-200 w-full flex flex-col md:flex-row space-y-4 md:space-y-0 md:justify-between rounded-2xl px-6 py-5 md:items-center">
   <% submitters = (submission.template_submitters || submission.template.submitters).filter_map { |item| submission.submitters.find { |e| e.uuid == item['uuid'] } } %>
-  <% is_submission_completed = submitters.all?(&:completed_at?) %>
+  <% is_submission_completed = submitters.all?(&:completed_at?) && submitters.size.positive? %>
   <% if submitters.size == 1 %>
     <div>
       <% submitter = submitters.first %>
@@ -49,7 +49,7 @@
         <% end %>
       <% end %>
       <span class="btn btn-outline btn-sm w-20 md:w-24">View</span>
-      <% if !submission.deleted_at? && can?(:destroy, submission) %>
+      <% if !submission.archived_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', form: { class: 'flex' }, title: 'Delete', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
       <% end %>
     </div>
@@ -134,7 +134,7 @@
         </form>
       <% end %>
       <span class="btn btn-outline btn-sm w-20 md:w-24">View</span>
-      <% unless submission.deleted_at? %>
+      <% unless submission.archived_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', form: { class: 'flex' }, title: 'Delete', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
       <% end %>
     </div>

app/views/templates/_template.html.erb

@@ -6,14 +6,14 @@
     <div class="pb-6 pt-1 space-y-1">
       <p class="flex items-center space-x-1 text-xs text-base-content/60">
         <%= svg_icon('user', class: 'w-4 h-4') %>
-        <span><%= template.author.full_name.presence || template.author.email %></span>
+        <span><%= template.author.full_name.presence || template.author.email.to_s.sub(/\+\w+@/, '@') %></span>
       </p>
       <p class="flex text-xs text-base-content/60">
         <span class="flex items-center space-x-1 w-1/2">
           <%= svg_icon('calendar', class: 'w-4 h-4') %>
           <span><%= l(template.created_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %></span>
         </span>
-        <% if template.deleted_at? %>
+        <% if template.archived_at? %>
           <span class="flex items-center space-x-1 w-1/2">
             <%= svg_icon('folder', class: 'w-4 h-4 flex-shrink-0') %>
             <span class="truncate"><%= template.folder.name %></span>
@@ -24,14 +24,14 @@
   </a>
   <div class="absolute top-0 bottom-0 w-0 flex items-center hidden md:group-hover:flex" style="right: 37px">
     <div class="space-y-1">
-      <% if can?(:update, template) && !template.deleted_at? %>
+      <% if can?(:update, template) && !template.archived_at? %>
         <span class="tooltip tooltip-left" data-tip="Move">
           <a href="<%= edit_template_folder_path(template.id) %>" data-turbo-frame="modal" class="btn btn-xs hover:btn-outline bg-base-200 btn-circle">
             <%= svg_icon('folder_share', class: 'w-4 h-4') %>
           </a>
         </span>
       <% end %>
-      <% if template.deleted_at? && can?(:update, template) %>
+      <% if template.archived_at? && can?(:update, template) %>
         <span class="tooltip tooltip-left" data-tip="Restore">
           <%= button_to template_restore_index_path(template), class: 'btn btn-xs hover:btn-outline bg-base-200 btn-circle' do %>
             <%= svg_icon('rotate', class: 'w-4 h-4 enabled') %>
@@ -53,9 +53,9 @@
         </span>
       <% end %>
       <% if can?(:destroy, template) %>
-        <span class="tooltip tooltip-left" data-tip="<%= template.deleted_at? ? 'Delete' : 'Archive' %>">
+        <span class="tooltip tooltip-left" data-tip="<%= template.archived_at? ? 'Delete' : 'Archive' %>">
-          <%= button_to template_path(template), data: { turbo_confirm: template.deleted_at? ? 'Template deletion is irreversible and will permanently remove all associated signed documents with it. Are you sure?' : 'Are you sure?' }, params: { permanently: template.deleted_at? }.compact_blank, method: :delete, class: 'btn btn-xs hover:btn-outline bg-base-200 btn-circle', aria_label: 'Restore' do %>
+          <%= button_to template_path(template), data: { turbo_confirm: template.archived_at? ? 'Template deletion is irreversible and will permanently remove all associated signed documents with it. Are you sure?' : 'Are you sure?' }, params: { permanently: template.archived_at? }.compact_blank, method: :delete, class: 'btn btn-xs hover:btn-outline bg-base-200 btn-circle', aria_label: 'Restore' do %>
-            <%= svg_icon(template.deleted_at? ? 'trash' : 'archive', class: 'w-4 h-4 enabled') %>
+            <%= svg_icon(template.archived_at? ? 'trash' : 'archive', class: 'w-4 h-4 enabled') %>
             <%= svg_icon('loader', class: 'w-4 h-4 animate-spin disabled') %>
           <% end %>
         </span>

app/views/templates/_title.html.erb

@@ -2,7 +2,7 @@
   <div>
     <h1 class="text-4xl font-semibold mr-4" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
       <%= template.name %>
-      <% if template.deleted_at? %>
+      <% if template.archived_at? %>
         <span class="badge badge-outline badge-lg align-middle">Archived</span>
       <% end %>
     </h1>
@@ -23,10 +23,10 @@
     </div>
   </div>
   <div class="flex md:justify-between space-x-2 flex-none pt-1">
-    <% if !template.deleted_at? %>
+    <% if !template.archived_at? %>
       <%= render 'shared/clipboard_copy', text: start_form_url(slug: @template.slug), class: 'btn btn-sm btn-neutral text-white', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy Link', copied_title: 'Copied', copy_title_md: 'Link', copied_title_md: 'Copied' %>
     <% end %>
-    <% if !template.deleted_at? && can?(:destroy, template) %>
+    <% if !template.archived_at? && can?(:destroy, template) %>
       <%= button_to button_title(title: 'Archive', disabled_with: 'Archiving', title_class: 'hidden md:inline', icon: svg_icon('archive', class: 'w-6 h-6')), template_path(template), class: 'btn btn-outline btn-sm', method: :delete, data: { turbo_confirm: 'Are you sure?' } %>
     <% end %>
     <% if can?(:create, template) %>
@@ -35,7 +35,7 @@
         <span class="hidden md:inline">Clone</span>
       <% end %>
     <% end %>
-    <% if !template.deleted_at? && can?(:update, template) %>
+    <% if !template.archived_at? && can?(:update, template) %>
       <%= link_to edit_template_path(template), class: 'btn btn-outline btn-sm' do %>
         <span class="flex items-center justify-center space-x-2">
           <%= svg_icon('pencil', class: 'w-6 h-6') %>
@@ -43,7 +43,7 @@
         </span>
       <% end %>
     <% end %>
-    <% if template.deleted_at? && can?(:create, template) %>
+    <% if template.archived_at? && can?(:create, template) %>
       <%= button_to button_title(title: 'Restore', disabled_with: 'Restoring', icon: svg_icon('rotate', class: 'w-6 h-6')), template_restore_index_path(template), class: 'btn btn-outline btn-sm' %>
     <% end %>
   </div>

app/views/templates/show.html.erb

@@ -11,7 +11,7 @@
         <%= svg_icon('download', class: 'w-6 h-6 stroke-2') %>
         <span>Export</span>
       <% end %>
-      <% if !@template.deleted_at? && can?(:create, Submission) %>
+      <% if !@template.archived_at? && can?(:create, Submission) %>
         <%= link_to new_template_submission_path(@template), class: 'white-button !border', data: { turbo_frame: 'modal' } do %>
           <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
           <span>Add <span class="hidden md:inline">Recipients</span></span>
@@ -56,7 +56,7 @@
     <%= render partial: 'submission', collection: @submissions %>
   </div>
   <% view_archived_html = capture do %>
-    <% if @template.submissions.where.not(deleted_at: nil).exists? && !@template.deleted_at? %>
+    <% if @template.submissions.where.not(archived_at: nil).exists? && !@template.archived_at? %>
       <div>
         <a href="<%= template_archived_index_path(@template) %>" class="link text-sm">View Archived</a>
       </div>
@@ -74,7 +74,7 @@
     <div class="card-body text-center py-16">
       <div class="max-w-lg mx-auto">
         <p class="text-3xl font-bold text-base-content mb-4">There are no Submissions</p>
-        <% if @template.deleted_at.blank? && params[:q].blank? %>
+        <% if @template.archived_at.blank? && params[:q].blank? %>
           <p>Send an invitation to fill and complete the form</p>
           <div class="space-y-2 flex flex-col">
             <% if can?(:create, Submission) %>

bin/setup

@@ -5,7 +5,7 @@ require "fileutils"
 APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
+  system(*args, exception: true)
 end
 
 FileUtils.chdir APP_ROOT do

config/application.rb

@@ -8,6 +8,7 @@ require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'action_mailer/railtie'
 require 'active_job/railtie'
+require 'rails/health_controller'
 
 require_relative '../lib/api_path_consider_json_middleware'
 
@@ -15,14 +16,13 @@ Bundler.require(*Rails.groups)
 
 module DocuSeal
   class Application < Rails::Application
-    config.load_defaults 7.0
+    config.load_defaults 7.1
 
-    config.autoload_paths << Rails.root.join('lib')
+    config.autoload_lib(ignore: %w[assets tasks])
-    config.eager_load_paths << Rails.root.join('lib')
 
     config.active_storage.routes_prefix = ''
 
-    config.i18n.available_locales = %i[en en-US en-GB es-ES fr-FR pt-PT de-DE]
+    config.i18n.available_locales = %i[en en-US en-GB es-ES fr-FR pt-PT de-DE pt]
     config.i18n.fallbacks = [:en]
 
     config.exceptions_app = ->(env) { ErrorsController.action(:show).call(env) }
@@ -32,6 +32,10 @@ module DocuSeal
     config.middleware.insert_before ActionDispatch::Static, Rack::Deflater
     config.middleware.insert_before ActionDispatch::Static, ApiPathConsiderJsonMiddleware
 
+    config.generators.system_tests = nil
+
+    autoloaders.once.do_not_eager_load("#{Turbo::Engine.root}/app/channels") # https://github.com/hotwired/turbo-rails/issues/512
+
     ActiveSupport.run_load_hooks(:application_config, self)
   end
 end

config/environments/development.rb

@@ -17,7 +17,7 @@ Rails.application.configure do
   # In the development environment your application's code is reloaded any time
   # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  config.enable_reloading = true
 
   # Do not eager load code on boot.
   config.eager_load = false
@@ -79,6 +79,8 @@ Rails.application.configure do
     key_derivation_salt: 'dev key derivation salt'
   }
 
+  ActiveRecord::Encryption.configure(**config.active_record.encryption)
+
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 

config/environments/production.rb

@@ -7,7 +7,7 @@ Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
-  config.cache_classes = true
+  config.enable_reloading = false
 
   config.public_file_server.headers = {
     'Cache-Control' => 'public, s-maxage=31536000, max-age=15552000',
@@ -115,6 +115,8 @@ Rails.application.configure do
     key_derivation_salt: Digest::SHA256.hexdigest(encryption_secret)
   }
 
+  ActiveRecord::Encryption.configure(**config.active_record.encryption)
+
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 

config/environments/test.rb

@@ -11,7 +11,7 @@ Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Turn false under Spring and add config.action_view.cache_template_loading = true.
-  config.cache_classes = true
+  config.enable_reloading = false
 
   # Eager loading loads your whole application. When running a single test locally,
   # this probably isn't necessary. It's a good idea to do in a continuous integration
@@ -67,6 +67,8 @@ Rails.application.configure do
     key_derivation_salt: 'test key derivation salt'
   }
 
+  ActiveRecord::Encryption.configure(**config.active_record.encryption)
+
   config.middleware.use(Class.new do
     def initialize(app)
       @app = app

config/initializers/devise.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../lib/auth_with_token_strategy'
-
-Warden::Strategies.add(:auth_token, AuthWithTokenStrategy)
-
 Devise.otp_allowed_drift = 60.seconds
 
 # Assuming you have not yet modified this file, each configuration option below
@@ -14,7 +10,6 @@ Devise.otp_allowed_drift = 60.seconds
 #
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
-# rubocop:disable Metrics/BlockLength
 Devise.setup do |config|
   config.warden do |manager|
     manager.default_strategies(scope: :user).unshift(:two_factor_authenticatable)
@@ -25,6 +20,7 @@ Devise.setup do |config|
   # confirmation, reset password and unlock tokens in the database.
   # Devise will use the `secret_key_base` as its `secret_key`
   # by default. You can change it below and use your own secret key.
+  config.secret_key = Rails.application.secret_key_base
 
   # ==> Controller configuration
   # Configure the parent class to the devise controllers.
@@ -274,24 +270,13 @@ Devise.setup do |config|
   # The default HTTP method used to sign out a resource. Default is :delete.
   config.sign_out_via = :delete
 
-  # ==> OmniAuth
-  # Add a new OmniAuth provider. Check the wiki for more information on setting
-  # up on your models and hooks.
-  config.omniauth :google_oauth2, ENV.fetch('GOOGLE_CLIENT_ID', nil), ENV.fetch('GOOGLE_CLIENT_SECRET', nil), {}
-  config.omniauth :microsoft_office365, ENV.fetch('OFFICE365_CLIENT_ID', nil),
-                  ENV.fetch('OFFICE365_CLIENT_SECRET', nil), {}
-
-  if ENV['GITHUB_CLIENT_ID']
-    config.omniauth :github, ENV.fetch('GITHUB_CLIENT_ID', nil), ENV.fetch('GITHUB_CLIENT_SECRET', nil), {}
-  end
-
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or
   # change the failure app, you can configure them inside the config.warden block.
   #
   config.warden do |manager|
     # manager.intercept_401 = false
-    manager.default_strategies(scope: :user).unshift(:auth_token)
+    # manager.default_strategies(scope: :user).unshift(:auth_token)
   end
 
   # ==> Mountable engine configurations
@@ -322,5 +307,6 @@ Devise.setup do |config|
   # When set to false, does not sign a user in automatically after their password is
   # changed. Defaults to true, so a user is signed in automatically after changing a password.
   # config.sign_in_after_change_password = true
+
+  ActiveSupport.run_load_hooks(:devise_config, config)
 end
-# rubocop:enable Metrics/BlockLength

config/initializers/filter_parameter_logging.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
-Rails.application.config.filter_parameters += %i[password token otp_attempt]
+Rails.application.config.filter_parameters += %i[password token otp_attempt passw secret token _key crypt salt
+                                                 certificate otp ssn]

config/locales/en.yml

@@ -1,9 +1,29 @@
 en-US:
+  digitally_signed_by: Digitally signed by
+  role: Role
   date:
     formats:
       default: "%m/%d/%Y"
 
 en-GB:
+  digitally_signed_by: Digitally signed by
+  role: Role
   date:
     formats:
       default: "%d/%m/%Y"
+
+es-ES:
+  digitally_signed_by: Firmado digitalmente por
+  role: Rol
+
+fr-FR:
+  digitally_signed_by: Signé numériquement par
+  role: Rôle
+
+pt-PT:
+  digitally_signed_by: Assinado digitalmente por
+  role: Função
+
+de-DE:
+  digitally_signed_by: Digital signiert von
+  role: Rolle

config/puma.rb

@@ -24,7 +24,7 @@ port ENV.fetch('PORT', 3000)
 environment ENV.fetch('RAILS_ENV', 'development')
 
 # Specifies the `pidfile` that Puma will use.
-pidfile ENV.fetch('PIDFILE', "#{Dir.tmpdir}/server.pid")
+# pidfile ENV.fetch('PIDFILE', "#{Dir.tmpdir}/server.pid")
 
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked web server processes. If using threads and workers together

config/routes.rb

@@ -6,11 +6,13 @@ Rails.application.routes.draw do
 
   root 'dashboard#index'
 
+  get 'up' => 'rails/health#show'
+
   devise_for :users,
              path: '/', only: %i[sessions passwords omniauth_callbacks],
              controllers: begin
                options = { sessions: 'sessions', passwords: 'passwords' }
-               options[:omniauth_callbacks] = 'omniauth_callbacks' if Docuseal.multitenant?
+               options[:omniauth_callbacks] = 'omniauth_callbacks' if User.devise_modules.include?(:omniauthable)
                options
              end
 
@@ -35,7 +37,7 @@ Rails.application.routes.draw do
     resources :template_folders_autocomplete, only: %i[index]
     resources :submitter_email_clicks, only: %i[create]
     resources :submitter_form_views, only: %i[create]
-    resources :submitters, only: %i[index show]
+    resources :submitters, only: %i[index show update]
     resources :submissions, only: %i[index show create destroy] do
       collection do
         resources :emails, only: %i[create], controller: 'submissions', as: :submissions_emails

db/migrate/20231229220819_rename_deleted_at_to_archived_at.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class RenameDeletedAtToArchivedAt < ActiveRecord::Migration[7.1]
+  def change
+    rename_column :templates, :deleted_at, :archived_at
+    rename_column :submissions, :deleted_at, :archived_at
+    rename_column :users, :deleted_at, :archived_at
+    rename_column :template_folders, :deleted_at, :archived_at
+  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_11_22_212612) do
+ActiveRecord::Schema[7.1].define(version: 2023_12_29_220819) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -130,7 +130,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_11_22_212612) do
   create_table "submissions", force: :cascade do |t|
     t.bigint "template_id", null: false
     t.bigint "created_by_user_id"
-    t.datetime "deleted_at"
+    t.datetime "archived_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.text "template_fields"
@@ -171,7 +171,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_11_22_212612) do
     t.string "name", null: false
     t.bigint "author_id", null: false
     t.bigint "account_id", null: false
-    t.datetime "deleted_at"
+    t.datetime "archived_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_template_folders_on_account_id"
@@ -186,7 +186,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_11_22_212612) do
     t.text "submitters", null: false
     t.bigint "author_id", null: false
     t.bigint "account_id", null: false
-    t.datetime "deleted_at"
+    t.datetime "archived_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.text "source", null: false
@@ -226,7 +226,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_11_22_212612) do
     t.integer "failed_attempts", default: 0, null: false
     t.string "unlock_token"
     t.datetime "locked_at"
-    t.datetime "deleted_at"
+    t.datetime "archived_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.text "uuid", null: false

lib/accounts.rb

@@ -19,7 +19,7 @@ module Accounts
       new_template.account = new_account
       new_template.slug = SecureRandom.base58(14)
 
-      new_template.deleted_at = nil
+      new_template.archived_at = nil
       new_template.save!
 
       Templates::CloneAttachments.call(template: new_template, original_template: template)

lib/auth_with_token_strategy.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class AuthWithTokenStrategy < Devise::Strategies::Base
-  def valid?
-    request.headers['X-Auth-Token'].present?
-  end
-
-  def authenticate!
-    sha256 = Digest::SHA256.hexdigest(request.headers['X-Auth-Token'])
-
-    user = User.joins(:access_token).find_by(access_token: { sha256: })
-
-    if user
-      success!(user)
-    else
-      fail!('Invalid token')
-    end
-  end
-end

lib/json_web_token.rb

@@ -4,10 +4,10 @@ module JsonWebToken
   module_function
 
   def encode(payload)
-    JWT.encode(payload, Rails.application.secrets.secret_key_base)
+    JWT.encode(payload, Rails.application.secret_key_base)
   end
 
   def decode(token)
-    JWT.decode(token, Rails.application.secrets.secret_key_base)[0]
+    JWT.decode(token, Rails.application.secret_key_base)[0]
   end
 end

lib/pdf_icons.rb

@@ -9,14 +9,26 @@ module PdfIcons
   module_function
 
   def check_io
-    @check_io ||= StringIO.new(PATH.join('check.png').read)
+    StringIO.new(check_data)
   end
 
   def paperclip_io
-    @paperclip_io ||= StringIO.new(PATH.join('paperclip.png').read)
+    StringIO.new(paperclip_data)
   end
 
   def logo_io
-    @logo_io ||= StringIO.new(PATH.join('logo.png').read)
+    StringIO.new(logo_data)
+  end
+
+  def check_data
+    @check_data ||= PATH.join('check.png').read
+  end
+
+  def paperclip_data
+    @paperclip_data ||= PATH.join('paperclip.png').read
+  end
+
+  def logo_data
+    @logo_data ||= PATH.join('logo.png').read
   end
 end

lib/pdf_processor.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class PdfProcessor < HexaPDF::Content::Processor
+  attr_reader :result, :contents
+  attr_accessor :handler
+
+  def initialize(page)
+    super
+
+    @contents = ''.b
+    @result = []
+
+    @serializer = HexaPDF::Serializer.new
+  end
+
+  def process(operator, operands = [])
+    super
+
+    contents << @operators[operator].serialize(
+      @serializer,
+      *handler.call(self, operator, operands)
+    )
+  end
+
+  def self.call(data, pdf_handler, result_handler, acc = {})
+    doc = HexaPDF::Document.new(io: StringIO.new(data))
+
+    doc.pages.each do |page|
+      processor = PdfProcessor.new(page)
+      processor.handler = pdf_handler
+
+      page.process_contents(processor)
+
+      page.contents = processor.contents
+
+      processor.result.each do |item|
+        result_handler.call(item, page, acc)
+      end
+    end
+
+    new_io = StringIO.new
+
+    doc.write(new_io)
+
+    [new_io.tap(&:rewind).read, acc]
+  end
+end

lib/replace_email_variables.rb

@@ -1,24 +1,31 @@
 # frozen_string_literal: true
 
 module ReplaceEmailVariables
-  TEMAPLTE_NAME = '{{template.name}}'
+  TEMPLATE_NAME = '{{template.name}}'
+  TEMPLATE_ID = '{{template.id}}'
   SUBMITTER_LINK = '{{submitter.link}}'
   ACCOUNT_NAME = '{{account.name}}'
   SUBMITTER_EMAIL = '{{submitter.email}}'
   SUBMITTER_NAME = '{{submitter.name}}'
+  SUBMITTER_ID = '{{submitter.id}}'
   SUBMISSION_LINK = '{{submission.link}}'
+  SUBMISSION_ID = '{{submission.id}}'
   SUBMISSION_SUBMITTERS = '{{submission.submitters}}'
   DOCUMENTS_LINKS = '{{documents.links}}'
   DOCUMENTS_LINK = '{{documents.link}}'
 
   module_function
 
+  # rubocop:disable Metrics
   def call(text, submitter:, tracking_event_type: 'click_email')
     submitter_link = build_submitter_link(submitter, tracking_event_type)
 
     submission_link = build_submission_link(submitter.submission) if submitter.submission
 
-    text = text.gsub(TEMAPLTE_NAME, submitter.template.name) if submitter.template
+    text = text.gsub(TEMPLATE_NAME, submitter.template.name) if submitter.template
+    text = text.gsub(TEMPLATE_ID, submitter.template.id.to_s) if submitter.template
+    text = text.gsub(SUBMITTER_ID, submitter.id.to_s)
+    text = text.gsub(SUBMISSION_ID, submitter.submission.id.to_s) if submitter.submission
     text = text.gsub(SUBMITTER_EMAIL, submitter.email) if submitter.email
     text = text.gsub(SUBMITTER_NAME, submitter.name || submitter.email || submitter.phone)
     text = text.gsub(SUBMITTER_LINK, submitter_link)
@@ -33,6 +40,7 @@ module ReplaceEmailVariables
 
     text
   end
+  # rubocop:enable Metrics
 
   def build_documents_links_text(submitter)
     Rails.application.routes.url_helpers.submissions_preview_url(

lib/submission_events.rb

@@ -21,7 +21,7 @@ module SubmissionEvents
 
   def build_tracking_param(submitter, event_type = 'click_email')
     Base64.urlsafe_encode64(
-      [submitter.slug, event_type, Rails.application.secrets.secret_key_base].join(':')
+      [submitter.slug, event_type, Rails.application.secret_key_base].join(':')
     ).first(TRACKING_PARAM_LENGTH)
   end
 

lib/submissions/create_from_submitters.rb

@@ -39,13 +39,14 @@ module Submissions
       end
     end
 
-    def maybe_set_template_fields(submission, submitters_attrs)
+    def maybe_set_template_fields(submission, submitters_attrs, submitter_uuid: nil)
-      template_fields = submission.template.fields.deep_dup
+      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 ||= 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)
 
         process_fields_param(submitter_attrs[:fields], template_fields, submitter_uuid)
       end
@@ -70,6 +71,21 @@ module Submissions
       end
     end
 
+    def process_field_values_param(values, template_fields, submitter_uuid)
+      return if values.blank?
+
+      template_fields.each do |f|
+        next if f['type'].in?(%w[signature image initials file])
+        next if f['submitter_uuid'] != submitter_uuid
+
+        value = values[f['uuid']]
+
+        next if value.blank?
+
+        f['default_value'] = value
+      end
+    end
+
     def process_fields_param(fields, template_fields, submitter_uuid)
       return if fields.blank?
 
@@ -83,6 +99,8 @@ module Submissions
         next if field_configs.blank?
 
         f['readonly'] = field_configs['readonly'] if field_configs['readonly'].present?
+        f['default_value'] = field_configs['default_value'] if field_configs['default_value'].present? &&
+                                                               !f['type'].in?(%w[signature image initials file])
 
         next if field_configs['validation_pattern'].blank?
 
@@ -111,7 +129,8 @@ module Submissions
         completed_at: attrs[:completed] ? Time.current : nil,
         sent_at: mark_as_sent && email.present? && is_order_sent ? Time.current : nil,
         values: attrs[:values] || {},
-        preferences: preferences.merge(submitter_preferences),
+        preferences: preferences.merge(submitter_preferences)
+                                .merge({ default_values: attrs[:values] }.compact_blank),
         uuid:
       )
     end

lib/submissions/generate_audit_trail.rb

@@ -17,11 +17,16 @@ module Submissions
                        'Helvetica'
                      end
 
-    INFO_CREATOR = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})".freeze
     SIGN_REASON = 'Signed with DocuSeal.co'
     VERIFIED_TEXT = 'Verified'
     UNVERIFIED_TEXT = 'Unverified'
 
+    CURRENCY_SYMBOLS = {
+      'USD' => '$',
+      'EUR' => '€',
+      'GBP' => '£'
+    }.freeze
+
     module_function
 
     # rubocop:disable Metrics
@@ -70,9 +75,11 @@ module Submissions
 
       composer.column(columns: 1) do |column|
         column.text("Envelope ID: #{submission.id}", font_size: 12, padding: [20, 0, 10, 0], position: :float)
-        column.formatted_text([
+
-                                { link: verify_url, text: 'Verify', style: :link }
+        unless submission.source_embed?
-                              ], font_size: 9, padding: [22, 0, 10, 0], position: :float, align: :right)
+          column.formatted_text([{ link: verify_url, text: 'Verify', style: :link }],
+                                font_size: 9, padding: [22, 0, 10, 0], position: :float, align: :right)
+        end
       end
 
       composer.draw_box(divider)
@@ -184,7 +191,7 @@ module Submissions
                 }
               ].compact_blank, line_spacing: 1.8, padding: [0, 0, 5, 0]
             ),
-            if field['type'].in?(%w[image signature initials])
+            if field['type'].in?(%w[image signature initials stamp])
               attachment = submitter.attachments.find { |a| a.uuid == value }
               image = Vips::Image.new_from_buffer(attachment.download, '').autorot
 
@@ -198,7 +205,15 @@ module Submissions
 
               composer.image(io, width:, height:, margin: [0, 0, 10, 0])
               composer.formatted_text_box([{ text: '' }])
-            elsif field['type'] == 'file'
+            elsif field['type'].in?(%w[file payment])
+              if field['type'] == 'payment'
+                unit = CURRENCY_SYMBOLS[field['preferences']['currency']]
+
+                price = ApplicationController.helpers.number_to_currency(field['preferences']['price'], unit:)
+
+                composer.formatted_text_box([{ text: "Paid #{price}\n" }], padding: [0, 0, 10, 0])
+              end
+
               composer.formatted_text_box(
                 Array.wrap(value).map do |uuid|
                   attachment = submitter.attachments.find { |a| a.uuid == uuid }
@@ -212,7 +227,10 @@ module Submissions
             elsif field['type'] == 'checkbox'
               composer.formatted_text_box([{ text: value.to_s.titleize }], padding: [0, 0, 10, 0])
             else
-              value = I18n.l(Date.parse(value), format: :long, locale: account.locale) if field['type'] == 'date'
+              if field['type'] == 'date'
+                value = TimeUtils.format_date_string(value, field.dig('preferences', 'format'), account.locale)
+              end
+
               value = value.join(', ') if value.is_a?(Array)
 
               composer.formatted_text_box([{ text: value.to_s.presence || 'n/a' }], padding: [0, 0, 10, 0])
@@ -238,7 +256,7 @@ module Submissions
               if event.event_type.include?('sms') || event.event_type.include?('phone')
                 submitter.phone
               else
-                (submitter.name || submitter.email || submitter.phone)
+                submitter.name || submitter.email || submitter.phone
               end
             ]
           )
@@ -249,7 +267,7 @@ module Submissions
 
       io = StringIO.new
 
-      composer.document.trailer.info[:Creator] = INFO_CREATOR
+      composer.document.trailer.info[:Creator] = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
 
       sign_params = {
         reason: SIGN_REASON,
@@ -258,7 +276,10 @@ module Submissions
         certificate_chain: pkcs.ca_certs || []
       }
 
-      sign_params[:timestamp_handler] = Submissions::TimestampHandler.new(tsa_url:) if tsa_url
+      if tsa_url
+        sign_params[:timestamp_handler] = Submissions::TimestampHandler.new(tsa_url:)
+        sign_params[:signature_size] = 10_000
+      end
 
       composer.document.sign(io, **sign_params)
 

lib/submissions/generate_result_attachments.rb

@@ -10,8 +10,8 @@ module Submissions
                   'Helvetica'
                 end
 
-    INFO_CREATOR = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})".freeze
+    SIGN_REASON = 'Signed by %<name>s with DocuSeal.co'
-    SIGN_REASON = 'Signed by %<email>s with DocuSeal.co'
+    SIGN_SIGNLE_REASON = 'Digitally signed with DocuSeal.co'
 
     TEXT_LEFT_MARGIN = 1
     TEXT_TOP_MARGIN = 1
@@ -39,7 +39,12 @@ module Submissions
         field.fetch('areas', []).each do |area|
           pdf = pdfs_index[area['attachment_uuid']]
 
+          next if pdf.nil?
+
           page = pdf.pages[area['page']]
+
+          next if page.nil?
+
           page.rotate(0, flatten: true) if page[:Rotate] != 0
 
           page[:Annots] ||= []
@@ -61,7 +66,7 @@ module Submissions
           canvas.font(FONT_NAME, size: font_size)
 
           case field['type']
-          when 'image', 'signature', 'initials'
+          when 'image', 'signature', 'initials', 'stamp'
             attachment = submitter.attachments.find { |a| a.uuid == value }
 
             image = Vips::Image.new_from_buffer(attachment.download, '').autorot
@@ -80,7 +85,7 @@ module Submissions
               width: image.width * scale,
               height: image.height * scale
             )
-          when 'file'
+          when 'file', 'payment'
             items = Array.wrap(value).each_with_object([]) do |uuid, acc|
               attachment = submitter.attachments.find { |a| a.uuid == uuid }
 
@@ -159,7 +164,9 @@ module Submissions
                                  height - (area['y'] * height))
             end
           else
-            value = I18n.l(Date.parse(value), format: :default, locale: account.locale) if field['type'] == 'date'
+            if field['type'] == 'date'
+              value = TimeUtils.format_date_string(value, field.dig('preferences', 'format'), account.locale)
+            end
 
             text = HexaPDF::Layout::TextFragment.create(Array.wrap(value).join(', '), font: pdf.fonts.add(FONT_NAME),
                                                                                       font_size:)
@@ -193,9 +200,9 @@ module Submissions
         submitter.submission.template_schema.map do |item|
           pdf = pdfs_index[item['attachment_uuid']]
 
-          attachment = save_signed_pdf(pdf:, submitter:, pkcs:, tsa_url:,
+          attachment = save_pdf(pdf:, submitter:, pkcs:, tsa_url:,
-                                       uuid: item['attachment_uuid'],
+                                uuid: item['attachment_uuid'],
-                                       name: item['name'])
+                                name: item['name'])
 
           image_pdfs << pdf if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
 
@@ -210,9 +217,10 @@ module Submissions
         end
 
       images_pdf_result =
-        save_signed_pdf(
+        save_pdf(
           pdf: images_pdf,
           submitter:,
+          tsa_url:,
           pkcs:,
           uuid: images_pdf_uuid(original_documents.select(&:image?)),
           name: template.name
@@ -222,27 +230,34 @@ module Submissions
     end
     # rubocop:enable Metrics
 
-    def save_signed_pdf(pdf:, submitter:, pkcs:, tsa_url:, uuid:, name:)
+    def save_pdf(pdf:, submitter:, pkcs:, tsa_url:, uuid:, name:)
       io = StringIO.new
 
       pdf.trailer.info[:Creator] = info_creator
 
-      sign_params = {
+      sign_reason = fetch_sign_reason(submitter)
-        reason: sign_reason(submitter.email),
-        certificate: pkcs.certificate,
-        key: pkcs.key,
-        certificate_chain: pkcs.ca_certs || []
-      }
 
-      sign_params[:timestamp_handler] = Submissions::TimestampHandler.new(tsa_url:) if tsa_url
+      if sign_reason
+        sign_params = {
+          reason: sign_reason,
+          certificate: pkcs.certificate,
+          key: pkcs.key,
+          certificate_chain: pkcs.ca_certs || []
+        }
 
-      pdf.sign(io, **sign_params)
+        if tsa_url
+          sign_params[:timestamp_handler] = Submissions::TimestampHandler.new(tsa_url:)
+          sign_params[:signature_size] = 10_000
+        end
+
+        pdf.sign(io, **sign_params)
+      else
+        pdf.write(io, incremental: true)
+      end
 
       ActiveStorage::Attachment.create!(
         uuid:,
-        blob: ActiveStorage::Blob.create_and_upload!(
+        blob: ActiveStorage::Blob.create_and_upload!(io: StringIO.new(io.string), filename: "#{name}.pdf"),
-          io: StringIO.new(io.string), filename: "#{name}.pdf"
-        ),
         metadata: { sha256: Base64.urlsafe_encode64(Digest::SHA256.digest(io.string)) },
         name: 'documents',
         record: submitter
@@ -263,7 +278,7 @@ module Submissions
       Submissions::EnsureResultGenerated.call(latest_submitter) if latest_submitter
 
       documents   = latest_submitter&.documents&.preload(:blob).to_a.presence
-      documents ||= submitter.submission.template.documents.preload(:blob)
+      documents ||= submitter.submission.template_schema_documents.preload(:blob)
 
       documents.to_h do |attachment|
         pdf =
@@ -297,12 +312,38 @@ module Submissions
       pdf
     end
 
-    def sign_reason(email)
+    def sign_reason(name)
-      format(SIGN_REASON, email:)
+      format(SIGN_REASON, name:)
+    end
+
+    def single_sign_reason
+      SIGN_SIGNLE_REASON
+    end
+
+    def fetch_sign_reason(submitter)
+      reason_name = submitter.email || submitter.name || submitter.phone
+
+      return sign_reason(reason_name) if Docuseal.multitenant?
+
+      config =
+        if Docuseal.multitenant?
+          AccountConfig.where(account: submitter.account, key: AccountConfig::ESIGNING_PREFERENCE_KEY)
+                       .first_or_initialize(value: 'multiple')
+        else
+          AccountConfig.where(key: AccountConfig::ESIGNING_PREFERENCE_KEY)
+                       .first_or_initialize(value: 'multiple')
+        end
+
+      return sign_reason(reason_name) if config.value == 'multiple'
+
+      return single_sign_reason if !submitter.submission.submitters.exists?(completed_at: nil) &&
+                                   submitter.completed_at == submitter.submission.submitters.maximum(:completed_at)
+
+      nil
     end
 
     def info_creator
-      INFO_CREATOR
+      "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
     end
 
     def h

lib/submissions/normalize_param_utils.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Submissions
+  module NormalizeParamUtils
+    module_function
+
+    def normalize_submissions_params!(submissions_params, template)
+      attachments = []
+
+      Array.wrap(submissions_params).each do |submission|
+        submission[:submitters].each_with_index do |submitter, index|
+          _, new_attachments = normalize_submitter_params!(submitter, template, index)
+
+          attachments.push(*new_attachments)
+        end
+      end
+
+      [submissions_params, attachments]
+    end
+
+    def normalize_submitter_params!(submitter_params, template, index = nil, for_submitter: nil)
+      default_values = submitter_params[:values] || {}
+
+      submitter_params[:fields]&.each do |f|
+        default_values[f[:name]] = f[:default_value] if f[:default_value].present?
+      end
+
+      return submitter_params if default_values.blank?
+
+      values, new_attachments =
+        Submitters::NormalizeValues.call(template,
+                                         default_values,
+                                         submitter_name: submitter_params[:role] ||
+                                                         template.submitters.dig(index, 'name'),
+                                         for_submitter:,
+                                         throw_errors: true)
+
+      submitter_params[:values] = values
+
+      [submitter_params, new_attachments]
+    end
+
+    def save_default_value_attachments!(attachments, submitters)
+      return if attachments.blank?
+
+      attachments_index = attachments.index_by(&:uuid)
+
+      submitters.each do |submitter|
+        submitter.values.each_value do |value|
+          attachment = attachments_index[value]
+
+          next unless attachment
+
+          attachment.record = submitter
+
+          attachment.save!
+        end
+      end
+    end
+  end
+end

lib/submitters/create_stamp_attachment.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module Submitters
+  module CreateStampAttachment
+    WIDTH = 400
+    HEIGHT = 200
+
+    TRANSPARENT_PIXEL = "\x89PNG\r\n\u001A\n\u0000\u0000\u0000\rIHDR\u0000" \
+                        "\u0000\u0000\u0001\u0000\u0000\u0000\u0001\b\u0004" \
+                        "\u0000\u0000\u0000\xB5\u001C\f\u0002\u0000\u0000\u0000" \
+                        "\vIDATx\xDAc\xFC_\u000F\u0000\u0002\x83\u0001\x804\xC3ڨ" \
+                        "\u0000\u0000\u0000\u0000IEND\xAEB`\x82"
+
+    module_function
+
+    def call(submitter)
+      image = generate_stamp_image(submitter)
+
+      image_data = image.write_to_buffer('.png')
+
+      checksum = Digest::MD5.base64digest(image_data)
+
+      attachment = submitter.attachments.joins(:blob).find_by(blob: { checksum: })
+
+      attachment || ActiveStorage::Attachment.create!(
+        blob: ActiveStorage::Blob.create_and_upload!(io: StringIO.new(image_data), filename: 'stamp.png'),
+        metadata: { analyzed: true, identified: true, width: image.width, height: image.height },
+        name: 'attachments',
+        record: submitter
+      )
+    end
+
+    # rubocop:disable Metrics
+    def generate_stamp_image(submitter)
+      logo = Vips::Image.new_from_buffer(load_logo(submitter).read, '')
+
+      logo = logo.resize([WIDTH / logo.width.to_f, HEIGHT / logo.height.to_f].min)
+
+      base_layer = Vips::Image.black(WIDTH, HEIGHT).new_from_image([255, 255, 255]).copy(interpretation: :srgb)
+
+      opacity_layer = Vips::Image.new_from_buffer(TRANSPARENT_PIXEL, '').resize(WIDTH)
+
+      text = build_text_image(submitter)
+
+      text_layer = text.new_from_image([0, 0, 0]).copy(interpretation: :srgb)
+      text_layer = text_layer.bandjoin(text)
+
+      base_layer = base_layer.composite(logo, 'over',
+                                        x: (WIDTH - logo.width) / 2,
+                                        y: (HEIGHT - logo.height) / 2)
+
+      base_layer = base_layer.composite(opacity_layer, 'over')
+
+      base_layer.composite(text_layer, 'over',
+                           x: (WIDTH - text_layer.width) / 2,
+                           y: (HEIGHT - text_layer.height) / 2)
+    end
+
+    def build_text_image(submitter)
+      time = I18n.l(submitter.completed_at.in_time_zone(submitter.account.timezone), format: :long,
+                                                                                     locale: submitter.account.locale)
+
+      timezone = TimeUtils.timezone_abbr(submitter.account.timezone, submitter.completed_at)
+
+      name = if submitter.name.present? && submitter.email.present?
+               "#{submitter.name} #{submitter.email}"
+             else
+               submitter.name || submitter.email || submitter.phone
+             end
+
+      role = if submitter.submission.template_submitters.size > 1
+               item = submitter.submission.template_submitters.find { |e| e['uuid'] == submitter.uuid }
+
+               "#{I18n.t(:role, locale: submitter.account.locale)}: #{item['name']}\n"
+             else
+               ''
+             end
+
+      digitally_signed_by = I18n.t(:digitally_signed_by, locale: submitter.account.locale)
+
+      text = %(<span size="90">#{digitally_signed_by}: <b>#{name}</b>\n#{role}#{time} #{timezone}</span>)
+
+      Vips::Image.text(text, width: WIDTH, height: HEIGHT)
+    end
+    # rubocop:enable Metrics
+
+    def load_logo(_submitter)
+      PdfIcons.logo_io
+    end
+  end
+end

lib/submitters/normalize_values.rb

@@ -9,12 +9,8 @@ module Submitters
 
     module_function
 
-    def call(template, values, submitter_name, throw_errors: false)
+    def call(template, values, submitter_name: nil, for_submitter: nil, throw_errors: false)
-      submitter =
+      fields = fetch_fields(template, submitter_name:, for_submitter:)
-        template.submitters.find { |e| e['name'] == submitter_name } ||
-        raise(UnknownSubmitterName, "Unknown submitter: #{submitter_name}")
-
-      fields = template.fields.select { |e| e['submitter_uuid'] == submitter['uuid'] }
 
       fields_uuid_index = fields.index_by { |e| e['uuid'] }
       fields_name_index = build_fields_index(fields)
@@ -31,7 +27,7 @@ module Submitters
         next if key.blank?
 
         if fields_uuid_index[key]['type'].in?(%w[initials signature image file])
-          new_value, new_attachments = normalize_attachment_value(value, template.account)
+          new_value, new_attachments = normalize_attachment_value(value, template.account, for_submitter)
 
           attachments.push(*new_attachments)
 
@@ -44,27 +40,51 @@ module Submitters
       [normalized_values, attachments]
     end
 
+    def fetch_fields(template, submitter_name: nil, for_submitter: nil)
+      if submitter_name
+        submitter =
+          template.submitters.find { |e| e['name'] == submitter_name } ||
+          raise(UnknownSubmitterName, "Unknown submitter role: #{submitter_name}")
+      end
+
+      fields = for_submitter&.submission&.template_fields || template.fields
+
+      fields.select do |e|
+        submitter_uuid =
+          for_submitter&.uuid || submitter&.dig('uuid') ||
+          raise(UnknownSubmitterName, "Unknown submitter role: template defines #{template.submitters.pluck('name')}")
+
+        e['submitter_uuid'] == submitter_uuid
+      end
+    end
+
     def build_fields_index(fields)
       fields.index_by { |e| e['name'] }.merge(fields.index_by { |e| e['name'].to_s.parameterize.underscore })
     end
 
-    def normalize_attachment_value(value, account)
+    def normalize_attachment_value(value, account, for_submitter = nil)
       if value.is_a?(Array)
-        new_attachments = value.map { |v| build_attachment(v, account) }
+        new_attachments = value.map { |v| find_or_build_attachment(v, account, for_submitter) }
 
         [new_attachments.map(&:uuid), new_attachments]
       else
-        new_attachment = build_attachment(value, account)
+        new_attachment = find_or_build_attachment(value, account, for_submitter)
 
         [new_attachment.uuid, new_attachment]
       end
     end
 
-    def build_attachment(value, account)
+    def find_or_build_attachment(value, account, for_submitter = nil)
-      ActiveStorage::Attachment.new(
+      blob = find_or_create_blobs(account, value)
-        blob: find_or_create_blobs(account, value),
+
+      attachment = for_submitter.attachments.find_by(blob_id: blob.id) if for_submitter
+
+      attachment ||= ActiveStorage::Attachment.new(
+        blob:,
         name: 'attachments'
       )
+
+      attachment
     end
 
     def find_or_create_blobs(account, url)

lib/submitters/serialize_for_api.rb

@@ -19,7 +19,8 @@ module Submitters
       serialize_params = {
         include: {},
         only: %i[id slug uuid name email phone completed_at application_key
-                 opened_at sent_at created_at updated_at]
+                 opened_at sent_at created_at updated_at],
+        methods: %i[status]
       }
 
       serialize_params[:include][:template] = { only: %i[id name created_at updated_at] } if with_template

lib/submitters/submit_values.rb

@@ -74,6 +74,12 @@ module Submitters
       default_values = submitter.submission.template_fields.each_with_object({}) do |field, acc|
         next if field['submitter_uuid'] != submitter.uuid
 
+        if field['type'] == 'stamp'
+          acc[field['uuid']] ||= Submitters::CreateStampAttachment.call(submitter).uuid
+
+          next
+        end
+
         value = field['default_value']
 
         next if value.blank?
@@ -99,7 +105,7 @@ module Submitters
     def replace_default_variables(value, attrs, template, with_time: false)
       return if value.blank?
 
-      value.gsub(VARIABLE_REGEXP) do |e|
+      value.to_s.gsub(VARIABLE_REGEXP) do |e|
         case key = ::Regexp.last_match(1)
         when 'time'
           if with_time

lib/templates/clone.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Templates
+  module Clone
+    module_function
+
+    def call(original_template, author:, application_key: nil, name: nil, folder_name: nil)
+      original_template_account = original_template.account
+
+      template = original_template_account.templates.new
+
+      template.application_key = application_key
+      template.author = author
+      template.name = name || "#{original_template.name} (Clone)"
+
+      template.assign_attributes(original_template.slice(:folder_id, :schema))
+
+      template.folder = TemplateFolders.find_or_create_by_name(author, folder_name) if folder_name.present?
+
+      submitter_uuids_replacements = {}
+
+      cloned_submitters = original_template['submitters'].deep_dup
+      cloned_fields = original_template['fields'].deep_dup
+
+      cloned_submitters.each do |submitter|
+        new_submitter_uuid = SecureRandom.uuid
+
+        submitter_uuids_replacements[submitter['uuid']] = new_submitter_uuid
+        submitter['uuid'] = new_submitter_uuid
+      end
+
+      cloned_fields.each do |field|
+        field['uuid'] = SecureRandom.uuid
+        field['submitter_uuid'] = submitter_uuids_replacements[field['submitter_uuid']]
+      end
+
+      template.assign_attributes(fields: cloned_fields, submitters: cloned_submitters)
+
+      template
+    end
+  end
+end

lib/templates/clone_attachments.rb

@@ -5,23 +5,48 @@ module Templates
     module_function
 
     def call(template:, original_template:)
-      original_template.documents.preload(:preview_images_attachments).each do |document|
+      schema_uuids_replacements = {}
+
+      cloned_schema = original_template['schema'].deep_dup
+      cloned_fields = template['fields'].deep_dup
+
+      cloned_schema.each do |schema_item|
+        new_schema_item_uuid = SecureRandom.uuid
+
+        schema_uuids_replacements[schema_item['attachment_uuid']] = new_schema_item_uuid
+        schema_item['attachment_uuid'] = new_schema_item_uuid
+      end
+
+      cloned_fields.each do |field|
+        next if field['areas'].blank?
+
+        field['areas'].each do |area|
+          area['attachment_uuid'] = schema_uuids_replacements[area['attachment_uuid']]
+        end
+      end
+
+      template.update!(schema: cloned_schema, fields: cloned_fields)
+
+      original_template.schema_documents.preload(:preview_images_attachments).each do |document|
         new_document = ActiveStorage::Attachment.create!(
-          uuid: document.uuid,
+          uuid: schema_uuids_replacements[document.uuid],
           blob_id: document.blob_id,
           name: 'documents',
           record: template
         )
 
-        ApplicationRecord.no_touching do
+        clone_document_preview_images_attachments(document:, new_document:)
-          document.preview_images_attachments.each do |preview_image|
+      end
-            ActiveStorage::Attachment.create!(
+    end
-              uuid: preview_image.uuid,
+
-              blob_id: preview_image.blob_id,
+    def clone_document_preview_images_attachments(document:, new_document:)
-              name: 'preview_images',
+      ApplicationRecord.no_touching do
-              record: new_document
+        document.preview_images_attachments.each do |preview_image|
-            )
+          ActiveStorage::Attachment.create!(
-          end
+            blob_id: preview_image.blob_id,
+            name: 'preview_images',
+            record: new_document
+          )
         end
       end
     end

lib/time_utils.rb

@@ -1,6 +1,26 @@
 # frozen_string_literal: true
 
 module TimeUtils
+  MONTH_FORMATS = {
+    'M' => '%-m',
+    'MM' => '%m',
+    'MMM' => '%b',
+    'MMMM' => '%B'
+  }.freeze
+
+  DAY_FORMATS = {
+    'D' => '%-d',
+    'DD' => '%d'
+  }.freeze
+
+  YEAR_FORMATS = {
+    'YYYY' => '%Y',
+    'YY' => '%y'
+  }.freeze
+
+  DEFAULT_DATE_FORMAT_US = 'MM/DD/YYYY'
+  DEFAULT_DATE_FORMAT = 'DD/MM/YYYY'
+
   module_function
 
   def timezone_abbr(timezone, time = Time.current)
@@ -10,4 +30,20 @@ module TimeUtils
 
     tz_info.abbreviation(time)
   end
+
+  def format_date_string(string, format, locale)
+    date = Date.parse(string.to_s)
+
+    format ||= locale.to_s.ends_with?('US') ? DEFAULT_DATE_FORMAT_US : DEFAULT_DATE_FORMAT
+
+    i18n_format = format.sub(/D+/, DAY_FORMATS[format[/D+/]])
+                        .sub(/M+/, MONTH_FORMATS[format[/M+/]])
+                        .sub(/Y+/, YEAR_FORMATS[format[/Y+/]])
+
+    I18n.l(date, format: i18n_format, locale:)
+  rescue Date::Error => e
+    Rollbar.error(e) if defined?(Rollbar)
+
+    string
+  end
 end

lib/users.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Users
-  module_function
-
-  def from_omniauth(oauth)
-    user = User.find_by(email: oauth.info.email.to_s.downcase)
-
-    return user if user
-
-    case oauth['provider'].to_s
-    when 'google_oauth2'
-      User.new(email: oauth.info.email,
-               first_name: oauth.extra.id_info.given_name,
-               last_name: oauth.extra.id_info.family_name)
-    when 'microsoft_office365'
-      User.new(email: oauth.info.email,
-               first_name: oauth.info.first_name,
-               last_name: oauth.info.last_name)
-    when 'github'
-      User.new(email: oauth.info.email, first_name: oauth.info.name)
-    end
-  end
-end