download multiple files on safari ios

fix phone/payment fields visibility
fix draw area message
2026-11-05 06:42:32 -05:00 · 2024-01-01 20:44:52 +02:00 · 2024-01-01 16:32:35 +02:00 · 2024-01-01 13:18:09 +02:00 · 2024-01-01 13:07:25 +02:00 · 2023-12-31 17:23:27 +02:00
70 changed files with 773 additions and 394 deletions
@@ -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
@@ -26,6 +26,7 @@ gem 'pdf-reader'
 gem 'pg', require: false
 gem 'premailer-rails'
 gem 'puma'
+gem 'rack'
 gem 'rails'
 gem 'rails_autolink'
 gem 'rails-i18n'
@@ -2,93 +2,102 @@ GEM
  remote: https://rubygems.org/
  specs:
    Ascii85 (1.1.0)
-    actioncable (7.0.7)
-      actionpack (= 7.0.7)
-      activesupport (= 7.0.7)
+    actioncable (7.1.2)
+      actionpack (= 7.1.2)
+      activesupport (= 7.1.2)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.7)
-      actionpack (= 7.0.7)
-      activejob (= 7.0.7)
-      activerecord (= 7.0.7)
-      activestorage (= 7.0.7)
-      activesupport (= 7.0.7)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.2)
+      actionpack (= 7.1.2)
+      activejob (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.0.7)
-      actionpack (= 7.0.7)
-      actionview (= 7.0.7)
-      activejob (= 7.0.7)
-      activesupport (= 7.0.7)
+    actionmailer (7.1.2)
+      actionpack (= 7.1.2)
+      actionview (= 7.1.2)
+      activejob (= 7.1.2)
+      activesupport (= 7.1.2)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.7)
-      actionview (= 7.0.7)
-      activesupport (= 7.0.7)
-      rack (~> 2.0, >= 2.2.4)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.2)
+      actionview (= 7.1.2)
+      activesupport (= 7.1.2)
+      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-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.7)
-      actionpack (= 7.0.7)
-      activerecord (= 7.0.7)
-      activestorage (= 7.0.7)
-      activesupport (= 7.0.7)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.2)
+      actionpack (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.0.7)
-      activesupport (= 7.0.7)
+    actionview (7.1.2)
+      activesupport (= 7.1.2)
      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.7)
-      activesupport (= 7.0.7)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.2)
+      activesupport (= 7.1.2)
      globalid (>= 0.3.6)
-    activemodel (7.0.7)
-      activesupport (= 7.0.7)
-    activerecord (7.0.7)
-      activemodel (= 7.0.7)
-      activesupport (= 7.0.7)
-    activestorage (7.0.7)
-      actionpack (= 7.0.7)
-      activejob (= 7.0.7)
-      activerecord (= 7.0.7)
-      activesupport (= 7.0.7)
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activerecord (7.1.2)
+      activemodel (= 7.1.2)
+      activesupport (= 7.1.2)
+      timeout (>= 0.4.0)
+    activestorage (7.1.2)
+      actionpack (= 7.1.2)
+      activejob (= 7.1.2)
+      activerecord (= 7.1.2)
+      activesupport (= 7.1.2)
      marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.7)
+    activesupport (7.1.2)
+      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-partitions (1.807.0)
-    aws-sdk-core (3.180.3)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.874.0)
+    aws-sdk-core (3.190.1)
+      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-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.75.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.132.1)
-      aws-sdk-core (~> 3, >= 3.179.0)
+    aws-sdk-s3 (1.142.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.8)
+    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)
-    date (3.3.3)
-    debug (1.8.0)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
+      ferrum (~> 0.14.0)
+    date (3.3.4)
+    debug (1.9.1)
+      irb (~> 1.10)
+      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 (~> 6.2.0)
+    factory_bot_rails (6.4.2)
+      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)
-      activesupport (>= 5.0)
-    google-apis-core (0.11.1)
+    globalid (1.2.1)
+      activesupport (>= 6.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,30 +233,30 @@ 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-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
+    google-cloud-env (2.1.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)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.9.1)
+      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)
    hexapdf (0.34.1)
      cmdparse (~> 3.0, >= 3.0.3)
@@ -256,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)
-    irb (1.7.4)
-      reline (>= 0.3.6)
+    io-console (0.7.1)
+    irb (1.11.0)
+      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)
@@ -272,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)
@@ -287,49 +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)
    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)
-    nokogiri (1.15.4)
+    nio4r (2.7.0)
+    nokogiri (1.15.5)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.15.4-arm64-darwin)
-      racc (~> 1.4)
-    oj (3.16.0)
+    oj (3.16.3)
+      bigdecimal (>= 3.0)
    openssl (3.2.0)
    orm_adapter (0.5.0)
    os (1.1.4)
-    pagy (6.0.4)
-    parallel (1.23.0)
+    pagy (6.2.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)
@@ -343,29 +356,36 @@ GEM
      method_source (~> 1.0)
    pry-rails (0.3.9)
      pry (>= 0.10.4)
-    public_suffix (5.0.3)
-    puma (6.3.1)
+    psych (5.1.2)
+      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-proxy (0.7.6)
+    rack-proxy (0.7.7)
      rack
+    rack-session (1.0.2)
+      rack (< 3)
    rack-test (2.1.0)
      rack (>= 1.3)
-    rails (7.0.7)
-      actioncable (= 7.0.7)
-      actionmailbox (= 7.0.7)
-      actionmailer (= 7.0.7)
-      actionpack (= 7.0.7)
-      actiontext (= 7.0.7)
-      actionview (= 7.0.7)
-      activejob (= 7.0.7)
-      activemodel (= 7.0.7)
-      activerecord (= 7.0.7)
-      activestorage (= 7.0.7)
-      activesupport (= 7.0.7)
+    rackup (1.0.0)
+      rack (< 3)
+      webrick
+    rails (7.1.2)
+      actioncable (= 7.1.2)
+      actionmailbox (= 7.1.2)
+      actionmailer (= 7.1.2)
+      actionpack (= 7.1.2)
+      actiontext (= 7.1.2)
+      actionview (= 7.1.2)
+      activejob (= 7.1.2)
+      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
@@ -380,19 +400,22 @@ GEM
      actionview (> 3.1)
      activesupport (> 3.1)
      railties (> 3.1)
-    railties (7.0.7)
-      actionpack (= 7.0.7)
-      activesupport (= 7.0.7)
-      method_source
+    railties (7.1.2)
+      actionpack (= 7.1.2)
+      activesupport (= 7.1.2)
+      irb
+      rackup (>= 1.0.0)
      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
    rainbow (3.1.1)
-    rake (13.0.6)
-    redis-client (0.16.0)
+    rake (13.1.0)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
+    redis-client (0.19.1)
      connection_pool
-    regexp_parser (2.8.2)
-    reline (0.3.8)
+    regexp_parser (2.8.3)
+    reline (0.4.1)
      io-console (~> 0.5)
    representable (3.2.0)
      declarative (< 0.1.0)
@@ -400,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)
@@ -419,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)
@@ -428,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)
@@ -436,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)
@@ -445,20 +468,21 @@ GEM
      rubocop (~> 1.41)
    rubocop-factory_bot (2.24.0)
      rubocop (~> 1.33)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.22.1)
+    rubocop-performance (1.20.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    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)
@@ -466,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)
@@ -488,34 +512,35 @@ GEM
    simplecov-html (0.12.3)
    simplecov_json_formatter (0.1.4)
    smart_properties (1.17.0)
-    sqlite3 (1.6.3)
+    sqlite3 (1.7.0)
      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)
-    timeout (0.4.0)
+    thor (1.3.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)
    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)
@@ -525,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
@@ -565,6 +590,7 @@ DEPENDENCIES
  premailer-rails
  pry-rails
  puma
+  rack
  rails
  rails-i18n
  rails_autolink
@@ -592,4 +618,4 @@ RUBY VERSION
   ruby 3.2.2p53

 BUNDLED WITH
-   2.4.10
+   2.5.3
@@ -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,8 +33,8 @@ 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('id > ?', params[:before]) if params[:before].present?
+      result = result.where(relation.arel_table[:id].lt(params[:after])) if params[:after].present?
+      result = result.where(relation.arel_table[:id].gt(params[:before])) if params[:before].present?

      result
    end
@@ -63,6 +63,8 @@ module Api
    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)

@@ -76,7 +78,7 @@ 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], methods: %i[archived_at])
    end
@@ -116,8 +118,8 @@ module Api

    def serialize_params
      {
-        only: %i[id source submitters_order created_at updated_at],
-        methods: %i[audit_log_url archived_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
                                 completed_at opened_at sent_at
@@ -80,18 +80,26 @@ module Api
    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]
+      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
@@ -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
@@ -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
@@ -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)
@@ -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
@@ -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,7 +42,7 @@ class SubmitFormController < ApplicationController
      return render json: { error: 'Form has been completed already.' }, status: :unprocessable_entity
    end

-    if submitter.template.deleted_at? || submitter.submission.deleted_at?
+    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
@@ -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)
@@ -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))
@@ -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
@@ -70,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
@@ -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
@@ -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)
@@ -86,7 +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 !== 'false',
+      withPayment: this.dataset.withPayment === 'true',
      acceptFileTypes: this.dataset.acceptFileTypes,
      isDirectUpload: this.dataset.isDirectUpload === 'true'
    })
@@ -75,6 +75,23 @@ button[disabled] .enabled {
  @apply select base-input w-full font-normal;
 }

+.tooltip-bottom-start:before {
+  transform: translateX(-30%);
+  top: var(--tooltip-offset);
+  left: 100%;
+  right: auto;
+  bottom: auto;
+}
+
+.tooltip-bottom-start:after {
+  transform: translateX(-75%);
+  border-color: transparent transparent var(--tooltip-color) transparent;
+  top: var(--tooltip-tail-offset);
+  left: 50%;
+  right: auto;
+  bottom: auto;
+}
+
 .autocomplete {
  background: white;
  z-index: 1000;
@@ -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) => {
-        return () => {
-          return fetch(url).then(async (resp) => {
-            const blobUrl = URL.createObjectURL(await resp.blob())
-            const link = document.createElement('a')
+      const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)

-            link.href = blobUrl
-            link.setAttribute('download', decodeURI(url.split('/').pop()))
+      if (isSafariIos && urls.length > 1) {
+        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(
-        (prevPromise, request) => prevPromise.then(() => request()),
-        Promise.resolve()
-      )
+    Promise.all(fileRequests).then((links) => {
+      links.forEach((link, index) => {
+        setTimeout(() => {
+          link.click()

+          URL.revokeObjectURL(link.href)
+        }, index * 50)
+      })
+    }).finally(() => {
      this.toggleState()
    })
  }
@@ -179,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) => {
-          return () => {
-            return fetch(url).then(async (resp) => {
-              const blobUrl = URL.createObjectURL(await resp.blob())
-              const link = document.createElement('a')
+        const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)

-              link.href = blobUrl
-              link.setAttribute('download', decodeURI(url.split('/').pop()))
+        if (isSafariIos && urls.length > 1) {
+          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(
-          (prevPromise, request) => prevPromise.then(() => request()),
-          Promise.resolve()
-        )
+      Promise.all(fileRequests).then((links) => {
+        links.forEach((link, index) => {
+          setTimeout(() => {
+            link.click()

+            URL.revokeObjectURL(link.href)
+          }, index * 50)
+        })
+      }).finally(() => {
        this.isDownloading = false
      })
    }
@@ -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"
@@ -283,6 +285,7 @@
          class="mt-6 md:mt-8"
        >
          <button
+            id="submit_form_button"
            ref="submitButton"
            type="submit"
            class="base-button w-full flex justify-center"
@@ -323,18 +326,25 @@
        :can-send-email="canSendEmail && !!submitter.email"
        :submitter-slug="submitterSlug"
      />
-      <div class="flex justify-center">
-        <div class="flex items-center mt-5 mb-1">
+      <div
+        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>
@@ -6,7 +6,7 @@
    <div
      v-if="$slots.buttons || withTitle"
      class="flex justify-between py-1.5 items-center pr-4 top-0 z-10"
-      :class="{ sticky: withStickySubmitters }"
+      :class="{ sticky: withStickySubmitters || isBreakpointLg }"
      :style="{ backgroundColor }"
    >
      <div class="flex items-center space-x-3">
@@ -194,37 +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"
-          :model-value="''"
-          @update:model-value="startFieldDraw($event)"
-        >
-          <label
-            class="btn btn-neutral text-white btn-circle btn-lg group"
-            tabindex="0"
-          >
-            <IconPlus
-              class="group-focus:hidden"
-              width="28"
-              height="28"
-            />
-            <IconX
-              class="hidden group-focus:inline"
-              width="28"
-              height="28"
-            />
-          </label>
-        </FieldType>
+          :fields="template.fields"
+          :default-fields="defaultFields"
+          :selected-submitter="selectedSubmitter"
+          @select="startFieldDraw($event)"
+        />
      </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">
@@ -273,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 { IconUsersPlus, IconDeviceFloppy, IconWritingSign, IconInnerShadowTop, IconPlus, IconX } from '@tabler/icons-vue'
+import MobileFields from './mobile_fields'
+import { IconUsersPlus, IconDeviceFloppy, IconWritingSign, IconInnerShadowTop } from '@tabler/icons-vue'
 import { v4 } from 'uuid'
 import { ref, computed } from 'vue'

@@ -285,10 +270,8 @@ export default {
    Document,
    Fields,
    MobileDrawField,
-    IconPlus,
-    FieldType,
-    IconX,
    IconWritingSign,
+    MobileFields,
    Logo,
    Dropzone,
    DocumentPreview,
@@ -414,8 +397,6 @@ export default {
    }
  },
  computed: {
-    fieldIcons: FieldType.computed.fieldIcons,
-    fieldNames: FieldType.computed.fieldNames,
    selectedAreaRef: () => ref(),
    fieldAreasIndex () {
      const areas = {}
@@ -489,31 +470,38 @@ export default {
    this.documentRefs = []
  },
  methods: {
-    startFieldDraw (type) {
-      const field = {
-        name: '',
-        uuid: v4(),
-        required: type !== 'checkbox',
-        areas: [],
-        submitter_uuid: this.selectedSubmitter.uuid,
-        type
-      }
+    startFieldDraw ({ name, type }) {
+      const existingField = this.template.fields?.find((f) => f.submitter_uuid === this.selectedSubmitter.uuid && name && name === f.name)

-      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'
+      if (existingField) {
+        this.drawField = existingField
+      } else {
+        const field = {
+          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
      }

-      this.drawField = field
      this.drawOption = null
    },
    undo () {
@@ -622,14 +610,14 @@ export default {
        }

        if (area.w === 0 || area.h === 0) {
-          const previousField = [...this.template.fields].reverse().find((f) => f.type === this.drawField.type && f !== this.drawField)
+          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 (previousField?.areas?.length) {
-            area.w = previousField.areas[0].w
-            area.h = previousField.areas[0].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
@@ -900,9 +888,11 @@ export default {
      })
    },
    save () {
-      if (this.$el.closest('template-builder')) {
-        this.$el.closest('template-builder').dataset.template = JSON.stringify(this.template)
-      }
+      this.$nextTick(() => {
+        if (this.$el.closest('template-builder')) {
+          this.$el.closest('template-builder').dataset.template = JSON.stringify(this.template)
+        }
+      })

      this.pushUndo()

@@ -70,8 +70,10 @@
            :field="field"
          />
          <span
-            v-else-if="!defaultField"
+            v-else
            class="dropdown dropdown-end"
+            @mouseenter="renderDropdown = true"
+            @touchstart="renderDropdown = true"
          >
            <label
              tabindex="0"
@@ -84,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"
@@ -91,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
              >
@@ -153,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">
@@ -331,7 +334,8 @@ export default {
  data () {
    return {
      isNameFocus: false,
-      showPaymentModal: false
+      showPaymentModal: false,
+      renderDropdown: false
    }
  },
  computed: {
@@ -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 [
@@ -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 || withPayment || !['phone', 'payment'].includes(type)">
+        <li v-if="(withPhone || type != 'phone') && (withPayment || type != 'payment')">
          <a
            href="#"
            class="text-sm py-1 px-2"
@@ -78,6 +82,11 @@ export default {
    }
  },
  emits: ['update:model-value'],
+  data () {
+    return {
+      renderDropdown: false
+    }
+  },
  computed: {
    fieldNames () {
      return {
@@ -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"
@@ -92,6 +93,7 @@
      <div
        v-else-if="type == 'phone'"
        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
@@ -210,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) {
-        const field = this.fields.find((f) => f.uuid === targetFieldUuid)
-
-        const currentIndex = this.fields.indexOf(this.dragField)
-        const targetIndex = this.fields.indexOf(field)
+      if (dragField && targetField && targetField !== dragField) {
+        const fields = Array.from(this.$refs.fields.children)
+        const currentIndex = fields.indexOf(dragField)
+        const targetIndex = fields.indexOf(targetField)

        if (currentIndex < targetIndex) {
-          this.fields.splice(targetIndex + 1, 0, this.dragField)
-          this.fields.splice(currentIndex, 1)
+          targetField.after(dragField)
        } else {
-          this.fields.splice(targetIndex, 0, this.dragField)
-          this.fields.splice(currentIndex + 1, 1)
+          targetField.before(dragField)
        }
      }
    },
+    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) {
@@ -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>
@@ -141,6 +141,13 @@
            </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>
@@ -60,5 +60,5 @@ class AccountConfig < ApplicationRecord

  belongs_to :account

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

  encrypts :value

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

  encrypts :value

-  serialize :value, JSON
+  serialize :value, coder: JSON
 end
@@ -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_schema, JSON
-  serialize :template_submitters, JSON
-  serialize :preferences, JSON
+  serialize :template_fields, coder: JSON
+  serialize :template_schema, coder: JSON
+  serialize :template_submitters, coder: 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)) }

@@ -71,10 +71,6 @@ class Submission < ApplicationRecord
    preserved: 'preserved'
  }, scope: false, prefix: true

-  def archived_at
-    deleted_at
-  end
-
  def audit_trail_url
    return if audit_trail.blank?

@@ -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

@@ -41,8 +41,8 @@ class Submitter < ApplicationRecord
  attribute :preferences, :string, default: -> { {} }
  attribute :slug, :string, default: -> { SecureRandom.base58(14) }

-  serialize :values, JSON
-  serialize :preferences, JSON
+  serialize :values, coder: JSON
+  serialize :preferences, coder: JSON

  has_many_attached :documents
  has_many_attached :attachments
@@ -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 :schema, JSON
-  serialize :submitters, JSON
+  serialize :fields, coder: JSON
+  serialize :schema, coder: 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 :archived, -> { where.not(deleted_at: nil) }
+  scope :active, -> { where(archived_at: nil) }
+  scope :archived, -> { where.not(archived_at: nil) }

  private

@@ -4,13 +4,13 @@
 #
 # Table name: template_folders
 #
-#  id         :bigint           not null, primary key
-#  deleted_at :datetime
-#  name       :string           not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  account_id :bigint           not null
-#  author_id  :bigint           not null
+#  id          :bigint           not null, primary key
+#  archived_at :datetime
+#  name        :string           not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  account_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
@@ -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
@@ -62,7 +64,7 @@ class User < ApplicationRecord
  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
@@ -70,7 +72,7 @@ class User < ApplicationRecord
  end

  def active_for_authentication?
-    !deleted_at?
+    !archived_at?
  end

  def remember_me
@@ -25,5 +25,5 @@ class UserConfig < ApplicationRecord

  belongs_to :user

-  serialize :value, JSON
+  serialize :value, coder: JSON
 end
@@ -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>
@@ -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>
@@ -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' %>
@@ -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| %>
@@ -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>
@@ -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 %>
@@ -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>
@@ -13,7 +13,7 @@
          <%= 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' %>">
-          <%= 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 %>
-            <%= svg_icon(template.deleted_at? ? 'trash' : 'archive', class: 'w-4 h-4 enabled') %>
+        <span class="tooltip tooltip-left" data-tip="<%= template.archived_at? ? 'Delete' : 'Archive' %>">
+          <%= 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.archived_at? ? 'trash' : 'archive', class: 'w-4 h-4 enabled') %>
            <%= svg_icon('loader', class: 'w-4 h-4 animate-spin disabled') %>
          <% end %>
        </span>
@@ -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>
@@ -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) %>
@@ -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
@@ -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.eager_load_paths << Rails.root.join('lib')
+    config.autoload_lib(ignore: %w[assets tasks])

    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
@@ -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

@@ -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

@@ -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
@@ -20,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.
@@ -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]
@@ -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
@@ -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
@@ -6,6 +6,8 @@ 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
@@ -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
@@ -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
@@ -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)
@@ -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
@@ -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

@@ -46,6 +46,7 @@ module Submissions
        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
@@ -17,7 +17,6 @@ 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'
@@ -268,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,
@@ -10,7 +10,6 @@ module Submissions
                  'Helvetica'
                end

-    INFO_CREATOR = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})".freeze
    SIGN_REASON = 'Signed by %<name>s with DocuSeal.co'
    SIGN_SIGNLE_REASON = 'Digitally signed with DocuSeal.co'

@@ -344,7 +343,7 @@ module Submissions
    end

    def info_creator
-      INFO_CREATOR
+      "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
    end

    def h
@@ -55,7 +55,6 @@ module Submitters
                           x: (WIDTH - text_layer.width) / 2,
                           y: (HEIGHT - text_layer.height) / 2)
    end
-    # rubocop:enable Metrics

    def build_text_image(submitter)
      time = I18n.l(submitter.completed_at.in_time_zone(submitter.account.timezone), format: :long,
@@ -72,15 +71,18 @@ module Submitters
      role = if submitter.submission.template_submitters.size > 1
               item = submitter.submission.template_submitters.find { |e| e['uuid'] == submitter.uuid }

-               "Role: #{item['name']}\n"
+               "#{I18n.t(:role, locale: submitter.account.locale)}: #{item['name']}\n"
             else
               ''
             end

-      text = %(<span size="90">Digitally signed by: <b>#{name}</b>\n#{role}#{time} #{timezone}</span>)
+      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
@@ -44,12 +44,18 @@ module Submitters
      if submitter_name
        submitter =
          template.submitters.find { |e| e['name'] == submitter_name } ||
-          raise(UnknownSubmitterName, "Unknown submitter: #{submitter_name}")
+          raise(UnknownSubmitterName, "Unknown submitter role: #{submitter_name}")
      end

      fields = for_submitter&.submission&.template_fields || template.fields

-      fields.select { |e| e['submitter_uuid'] == (for_submitter&.uuid || submitter['uuid']) }
+      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)
@@ -27,7 +27,7 @@
    "postcss-loader": "^7.3.0",
    "sass": "^1.62.1",
    "sass-loader": "^13.2.2",
-    "shakapacker": "7.0.3",
+    "shakapacker": "7.1.0",
    "signature_pad": "^4.1.5",
    "tailwindcss": "^3.3.2",
    "terser-webpack-plugin": "5.3.8",
@@ -4832,10 +4832,10 @@ setprototypeof@1.2.0:
  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

-shakapacker@7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.0.3.tgz#e67fca4e74c3ef380e1acf53a1d51ab4784ca01c"
-  integrity sha512-2kwNP8kadkmGOqb7Bp/iNzF3bV31zni8b35Uzst2DZHjnFcnDbW96MERXHc7lS3p3AmKJVbUBmHAFCPsLT9tcw==
+shakapacker@7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-7.1.0.tgz#95bd37db60702ffa21f9ea29a88f438de3db25b2"
+  integrity sha512-xKfF4LKrFQdMLYeIi/uBV6pfkPTO4lgCAIMx3W5+MHW61ENOXu4WeQ50qVR9u5hV6XXzi7AiS7C6dWO2GFnYAg==
  dependencies:
    glob "^7.2.0"
    js-yaml "^4.1.0"
Author	SHA1	Message	Date
Pete Matsyburka	1b2d978449	download multiple files on safari ios	2024-01-01 20:44:52 +02:00
Pete Matsyburka	30582b2d75	fix phone/payment fields visibility	2024-01-01 16:32:35 +02:00
Pete Matsyburka	38a8037a4d	fix draw area message	2024-01-01 13:18:09 +02:00
Pete Matsyburka	67de45f787	optimize fields reorder	2024-01-01 13:07:25 +02:00
Pete Matsyburka	f358f24abb	optimize form render with many fields	2023-12-31 17:23:27 +02:00
Pete Matsyburka	fd4e15003a	adjust create button style	2023-12-31 00:17:18 +02:00
Pete Matsyburka	81df249d5c	refactor user roles validate	2023-12-30 22:51:26 +02:00
Pete Matsyburka	ba60997992	fix signature update	2023-12-30 15:12:00 +02:00
Pete Matsyburka	8961294a29	do not use puma pidfile	2023-12-30 13:34:22 +02:00
Pete Matsyburka	bc2e0a000a	adjust phone tooltip position	2023-12-30 11:46:04 +02:00
Pete Matsyburka	1a693fba2d	remove payment field type from selfhosted	2023-12-30 11:42:46 +02:00
Pete Matsyburka	05b7acf6aa	fix AR encryption	2023-12-30 01:44:05 +02:00
Pete Matsyburka	de13d8d397	refactor pdf info creator	2023-12-30 01:19:46 +02:00
Pete Matsyburka	6d7d8ae87c	rename deleted_at to archived_at	2023-12-30 00:37:03 +02:00
Pete Matsyburka	cfb1bdcd52	back to ruby 3.2.2	2023-12-29 21:52:23 +02:00
Pete Matsyburka	48d41833f1	use Rails.application.secret_key_base	2023-12-29 21:08:10 +02:00
Alex Turchyn	01535f1afc	add health-check endpoint	2023-12-29 20:51:19 +02:00
Alex Turchyn	fe845bfa36	rails v7.1.2 and ruby to v3.3.0	2023-12-29 20:50:36 +02:00
Pete Matsyburka	b94dbc75b7	preserve default values on resubmit	2023-12-29 19:09:43 +02:00
Pete Matsyburka	bdf40640d0	add payment learn more button	2023-12-29 01:55:51 +02:00
Pete Matsyburka	496f6c706b	render cell only if width specified	2023-12-29 00:05:55 +02:00
Pete Matsyburka	79f97d5555	fix update submitter with API completion	2023-12-28 21:18:23 +02:00
Pete Matsyburka	82f679c84c	add error message when template not found	2023-12-28 17:39:09 +02:00
Pete Matsyburka	9b789889fa	add stamp translations	2023-12-28 17:38:21 +02:00
Pete Matsyburka	dd8dd118da	add button ids	2023-12-28 16:59:50 +02:00
Pete Matsyburka	8222a4b6a4	fix template show page	2023-12-28 01:13:47 +02:00
Pete Matsyburka	31f8057bfa	fix api pagination	2023-12-27 17:17:35 +02:00
Pete Matsyburka	1d8e0417bd	adjust default field area size	2023-12-27 16:44:20 +02:00
Pete Matsyburka	8100ca46c2	show builder default fields on mobile dropdown	2023-12-27 16:36:00 +02:00
Pete Matsyburka	94d745cf1c	rescue json parse error	2023-12-27 11:28:41 +02:00
Pete Matsyburka	a92bd0ad0f	error message on undefined submitter role	2023-12-27 11:05:07 +02:00