add personalization settings

app/controllers/personalization_settings_controller.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class PersonalizationSettingsController < ApplicationController
+  def show; end
+
+  def create
+    account_config =
+      current_account.account_configs.find_or_initialize_by(key: encrypted_config_params[:key])
+
+    account_config.update!(encrypted_config_params)
+
+    redirect_back(fallback_location: settings_personalization_path, notice: 'Settings have been saved.')
+  end
+
+  private
+
+  def encrypted_config_params
+    params.require(:account_config).permit!
+  end
+end

app/controllers/start_form_controller.rb

@@ -36,7 +36,9 @@ class StartFormController < ApplicationController
   end
 
   def completed
-    @submitter = Submitter.where(submission: @template.submissions).find_by!(email: params[:email])
+    @submitter = Submitter.where(submission: @template.submissions)
+                          .where.not(completed_at: nil)
+                          .find_by!(email: params[:email])
   end
 
   private

app/mailers/application_mailer.rb

@@ -6,6 +6,10 @@ class ApplicationMailer < ActionMailer::Base
 
   register_interceptor ActionMailerConfigsInterceptor
 
+  before_action do
+    ActiveStorage::Current.url_options = Docuseal.default_url_options
+  end
+
   def default_url_options
     Docuseal.default_url_options
   end

app/mailers/submitter_mailer.rb

@@ -4,15 +4,26 @@ class SubmitterMailer < ApplicationMailer
   DEFAULT_MESSAGE = %(You have been invited to submit the "%<name>s" form:)
 
   def invitation_email(submitter, message: '')
+    @current_account = submitter.submission.template.account
     @submitter = submitter
     @message = message.presence || format(DEFAULT_MESSAGE, name: submitter.submission.template.name)
 
+    @email_config = @current_account.account_configs.find_by(key: AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY)
+
+    subject =
+      if @email_config
+        ReplaceEmailVariables.call(@email_config.value['subject'], submitter:)
+      else
+        'You have been invited to submit a form'
+      end
+
     mail(to: @submitter.email,
-         subject: 'You have been invited to submit a form',
+         subject:,
          reply_to: submitter.submission.created_by_user&.friendly_name)
   end
 
   def completed_email(submitter, user)
+    @current_account = submitter.submission.template.account
     @submitter = submitter
     @user = user
 
@@ -21,6 +32,7 @@ class SubmitterMailer < ApplicationMailer
   end
 
   def documents_copy_email(submitter)
+    @current_account = submitter.submission.template.account
     @submitter = submitter
 
     Submissions::EnsureResultGenerated.call(@submitter)

app/mailers/user_mailer.rb

@@ -2,6 +2,7 @@
 
 class UserMailer < ApplicationMailer
   def invitation_email(user)
+    @current_account = user.account
     @user = user
     @token = @user.send(:set_reset_password_token)
 

app/models/account.rb

@@ -14,6 +14,7 @@
 class Account < ApplicationRecord
   has_many :users, dependent: :destroy
   has_many :encrypted_configs, dependent: :destroy
+  has_many :account_configs, dependent: :destroy
   has_many :templates, dependent: :destroy
   has_many :submissions, through: :templates
   has_many :submitters, through: :submissions

app/models/account_config.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: account_configs
+#
+#  id         :bigint           not null, primary key
+#  key        :string           not null
+#  value      :text             not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  account_id :bigint           not null
+#
+# Indexes
+#
+#  index_account_configs_on_account_id          (account_id)
+#  index_account_configs_on_account_id_and_key  (account_id,key) UNIQUE
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
+#
+class AccountConfig < ApplicationRecord
+  SUBMITTER_INVITATION_EMAIL_KEY = 'submitter_invitation_email'
+
+  DEFAULT_VALUES = {
+    SUBMITTER_INVITATION_EMAIL_KEY => {
+      'subject' => 'You have been invited to submit a form',
+      'body' => "Hi there,\n\n" \
+                "You have been invited to submit the \"{{template.name}}\" form:\n\n" \
+                "{{submitter.link}}\n\n" \
+                "Please contact us by replying to this email if you didn't request this.\n\n" \
+                "Thanks,\n" \
+                '{{account.name}}'
+    }
+  }.freeze
+
+  belongs_to :account
+
+  serialize :value, JSON
+end

app/views/layouts/mailer.html.erb

@@ -8,11 +8,6 @@
   </head>
   <body>
     <%= yield %>
-    <p>
-      ---
-    </p>
-    <p>
-      Sent using <a href="<%= Docuseal::PRODUCT_URL %>"><%= Docuseal::PRODUCT_NAME %></a> free document signing.
-    </p>
+    <%= render partial: 'shared/mailer_attribution' %>
   </body>
 </html>

app/views/personalization_settings/_logo_form.html.erb

@@ -0,0 +1 @@
+<%= render 'logo_placeholder' %>

app/views/personalization_settings/_logo_placeholder.html.erb

@@ -0,0 +1,11 @@
+<div class="alert my-4">
+  <%= svg_icon('info_circle', class: 'w-6 h-6') %>
+  <div>
+    <p class="font-bold">Unlock with DocuSeal Enterprise</p>
+    <p>
+      Display your company name and logo when signing documents.
+      <br>
+      <a class="link font-medium" target="_blank" href="<%= Docuseal::PRODUCT_URL + '/pricing' %>">Learn More</a>
+    </p>
+  </div>
+</div>

app/views/personalization_settings/show.html.erb

@@ -0,0 +1,27 @@
+<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">
+    <p class="text-4xl font-bold mb-4">Signature Request Email</p>
+    <%= form_for AccountConfigs.find_or_initialize_for_key(current_account, AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY), url: settings_personalization_path, method: :post, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %>
+      <%= f.hidden_field :key %>
+      <%= f.fields_for :value, OpenStruct.new(f.object.value) do |ff| %>
+        <div class="form-control">
+          <%= ff.label :subject, class: 'label' %>
+          <%= ff.text_field :subject, required: true, class: 'base-input' %>
+        </div>
+        <div class="form-control">
+          <%= ff.label :body, class: 'label' %>
+          <autoresize-textarea>
+            <%= ff.text_area :body, required: true, class: 'base-input w-full py-2' %>
+          </autoresize-textarea>
+        </div>
+      <% end %>
+      <div class="form-control pt-2">
+        <%= f.button button_title(title: 'Save', disabled_with: 'Saving'), class: 'base-button' %>
+      </div>
+    <% end %>
+    <p class="text-4xl font-bold mb-4 mt-8">Company Logo</p>
+    <%= render 'logo_form' %>
+  </div>
+  <div class="w-0 md:w-52"></div>
+</div>

app/views/send_submission_email/success.html.erb

@@ -2,12 +2,7 @@
   <div class="space-y-6 mx-auto">
     <div class="space-y-6">
       <div class="flex items-center justify-center">
-        <a href="/" class="flex items-center">
-          <div class="mr-3">
-            <%= render 'shared/logo', width: '50px', height: '50px' %>
-          </div>
-          <h1 class="text-5xl font-bold text-center">DocuSeal</h1>
-        </a>
+        <%= render 'start_form/docuseal_logo' %>
       </div>
       <div class="text-center text-4xl font-bold">
         Email has been sent

app/views/shared/_email_attribution.html.erb

@@ -0,0 +1,6 @@
+<p>
+  ---
+</p>
+<p>
+  Sent using <a href="<%= Docuseal::PRODUCT_URL %>"><%= Docuseal::PRODUCT_NAME %></a> free document signing.
+</p>

app/views/shared/_mailer_attribution.html.erb

@@ -0,0 +1 @@
+<%= render 'shared/email_attribution' %>

app/views/shared/_settings_nav.html.erb

@@ -31,6 +31,9 @@
           <%= link_to 'Webhooks', settings_webhooks_path, class: 'text-base hover:bg-base-300' %>
         </li>
       <% end %>
+      <li>
+        <%= link_to 'Personalization', settings_personalization_path, class: 'text-base hover:bg-base-300' %>
+      </li>
       <% unless Docuseal.demo? %>
         <li>
           <%= link_to Docuseal.multitenant? ? console_redirect_index_path : Docuseal::CONSOLE_URL, class: 'text-base hover:bg-base-300', data: { prefetch: false } do %>

app/views/start_form/_banner.html.erb

@@ -0,0 +1 @@
+<%= render 'docuseal_logo' %>

app/views/start_form/_docuseal_logo.html.erb

@@ -0,0 +1,6 @@
+<a href="/" class="flex justify-center items-center">
+  <span class="mr-3">
+    <%= render 'shared/logo', width: '50px', height: '50px' %>
+  </span>
+  <h1 class="text-5xl font-bold text-center">DocuSeal</h1>
+</a>

app/views/start_form/completed.html.erb

@@ -2,12 +2,7 @@
   <div class="space-y-6 mx-auto">
     <div class="space-y-6">
       <div class="flex items-center justify-center">
-        <a href="/" class="flex items-center">
-          <div class="mr-3">
-            <%= render 'shared/logo', width: '50px', height: '50px' %>
-          </div>
-          <h1 class="text-5xl font-bold text-center">DocuSeal</h1>
-        </a>
+        <%= render 'banner' %>
       </div>
       <div class="flex items-center bg-base-200 rounded-xl p-4 mb-4">
         <div class="flex items-center">

app/views/start_form/show.html.erb

@@ -2,12 +2,7 @@
   <div class="space-y-6 mx-auto">
     <div class="space-y-6">
       <div class="text-center w-full space-y-6">
-        <a href="/" class="flex justify-center items-center">
-          <span class="mr-3">
-            <%= render 'shared/logo', width: '50px', height: '50px' %>
-          </span>
-          <h1 class="text-5xl font-bold text-center">DocuSeal</h1>
-        </a>
+        <%= render 'banner' %>
         <p class="text-xl font-semibold text-center">You have been invited to submit a form</p>
       </div>
       <div class="flex items-center bg-base-200 rounded-xl p-4 mb-4">

app/views/submissions/new.html.erb

@@ -40,7 +40,7 @@
     <div class="form-control">
       <% is_smtp_configured = Accounts.can_send_emails?(current_account) %>
       <%= f.label :send_email, class: 'flex items-center cursor-pointer' do %>
-        <%= f.check_box :send_email, class: 'base-checkbox', disabled: !is_smtp_configured, onchange: "message_field.classList.toggle('hidden', !event.currentTarget.checked)" %>
+        <%= f.check_box :send_email, class: 'base-checkbox', disabled: !is_smtp_configured, onchange: "window.message_field && message_field.classList.toggle('hidden', !event.currentTarget.checked)" %>
         <span class="label">Send Email</span>
       <% end %>
       <% unless is_smtp_configured %>
@@ -57,21 +57,23 @@
         </div>
       <% end %>
     </div>
-    <div id="message_field" class="card card-compact bg-base-200 hidden">
-      <div class="card-body">
-        <div class="form-control space-y-2">
-          <span class="label-text">Hi there,</span>
-          <autoresize-textarea>
-            <%= f.text_area :message, value: format(SubmitterMailer::DEFAULT_MESSAGE, name: @template.name), required: true, class: 'base-textarea !rounded-lg w-full' %>
-          </autoresize-textarea>
-          <span class="label-text">
-            Thanks,
-            <br>
-            <%= current_account.name %>
-          </span>
+    <% unless AccountConfig.exists?(key: AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY) %>
+      <div id="message_field" class="card card-compact bg-base-200 hidden">
+        <div class="card-body">
+          <div class="form-control space-y-2">
+            <span class="label-text">Hi there,</span>
+            <autoresize-textarea>
+              <%= f.text_area :message, value: format(SubmitterMailer::DEFAULT_MESSAGE, name: @template.name), required: true, class: 'base-textarea !rounded-lg w-full' %>
+            </autoresize-textarea>
+            <span class="label-text">
+              Thanks,
+              <br>
+              <%= current_account.name %>
+            </span>
+          </div>
         </div>
       </div>
-    </div>
+    <% end %>
     <div class="form-control">
       <%= f.button button_title(title: 'Add Recipients'), class: 'base-button' %>
     </div>

app/views/submit_form/_banner.html.erb

@@ -0,0 +1 @@
+<%= render 'docuseal_logo' %>

app/views/submit_form/_docuseal_logo.html.erb

@@ -0,0 +1,4 @@
+<a href="<%= root_path %>" class="mx-auto text-2xl md:text-3xl font-bold items-center flex space-x-3">
+  <%= render 'shared/logo', class: 'w-9 h-9 md:w-12 md:h-12' %>
+  <span><%= Docuseal::PRODUCT_NAME %></span>
+</a>

app/views/submit_form/completed.html.erb

@@ -2,12 +2,7 @@
   <div class="space-y-6 mx-auto">
     <div class="space-y-6">
       <div class="flex items-center justify-center">
-        <a href="/" class="flex items-center">
-          <div class="mr-3">
-            <%= render 'shared/logo', width: '50px', height: '50px' %>
-          </div>
-          <h1 class="text-5xl font-bold text-center">DocuSeal</h1>
-        </a>
+        <%= render 'start_form/banner' %>
       </div>
       <div class="flex items-center bg-base-200 rounded-xl p-4 mb-4">
         <div class="flex items-center">

app/views/submit_form/show.html.erb

@@ -5,10 +5,7 @@
   <div id="scrollbox">
     <div class="mx-auto block pb-72" style="max-width: 1000px">
       <div class="mt-4 flex">
-        <a href="<%= root_path %>" class="mx-auto text-2xl md:text-3xl font-bold items-center flex space-x-3">
-          <%= render 'shared/logo', class: 'w-9 h-9 md:w-12 md:h-12' %>
-          <span>DocuSeal</span>
-        </a>
+        <%= render 'banner' %>
       </div>
       <% (@submitter.submission.template_schema || @submitter.submission.template.schema).each do |item| %>
         <% document = @submitter.submission.template.documents.find { |a| a.uuid == item['attachment_uuid'] } %>

app/views/submitter_mailer/documents_copy_email.html.erb

@@ -9,5 +9,5 @@
   </ul>
 <% end %>
 <p>
-  Thanks,<br><%= @submitter.submission.template.account.name %>
+  Thanks,<br><%= @current_account.name %>
 </p>

app/views/submitter_mailer/invitation_email.html.erb

@@ -1,7 +1,11 @@
-<p>Hi there,</p>
-<%= simple_format(@message) %>
-<p><%= link_to 'Submit Form', submit_form_url(slug: @submitter.slug) %></p>
-<p>Please contact us by replying to this email if you didn't request this.</p>
-<p>
-  Thanks,<br><%= @submitter.submission.template.account.name %>
-</p>
+<% if @email_config %>
+  <%= auto_link(simple_format(h(ReplaceEmailVariables.call(@email_config.value['body'], submitter: @submitter)))) %>
+<% else %>
+  <p>Hi there,</p>
+  <%= simple_format(@message) %>
+  <p><%= link_to 'Submit Form', submit_form_url(slug: @submitter.slug) %></p>
+  <p>Please contact us by replying to this email if you didn't request this.</p>
+  <p>
+    Thanks,<br><%= @current_account.name %>
+  </p>
+<% end %>

app/views/user_mailer/invitation_email.html.erb

@@ -3,5 +3,5 @@
 <p><%= link_to 'Sign up', invitation_url(reset_password_token: @token) %></p>
 <p>Please contact us by replying to this email if you didn't request this.</p>
 <p>
-  Thanks,<br><%= @user.account.name %>
+  Thanks,<br><%= @current_account.name %>
 </p>