From 7351ae0a7719ecc0219e473df19f93b39eb11d7f Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete.matsy@gmail.com>
Date: Mon, 11 Dec 2023 21:40:13 +0200
Subject: [PATCH] adjust integration submissions

---
 app/mailers/submitter_mailer.rb         | 19 +++++++++++++------
 lib/submissions/generate_audit_trail.rb |  8 +++++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/mailers/submitter_mailer.rb b/app/mailers/submitter_mailer.rb
index 54da3476..0d339b78 100644
--- a/app/mailers/submitter_mailer.rb
+++ b/app/mailers/submitter_mailer.rb
@@ -25,10 +25,12 @@ class SubmitterMailer < ApplicationMailer
         DEFAULT_INVITATION_SUBJECT
       end
 
-    mail(to: @submitter.friendly_name,
-         from: from_address_for_submitter(submitter),
-         subject:,
-         reply_to: (submitter.submission.created_by_user || submitter.template.author)&.friendly_name)
+    mail(
+      to: @submitter.friendly_name,
+      from: from_address_for_submitter(submitter),
+      subject:,
+      reply_to: (submitter.submission.created_by_user || submitter.template.author)&.friendly_name&.sub(/\+\w+@/, '@')
+    )
   end
 
   def completed_email(submitter, user, bcc: nil)
@@ -53,7 +55,7 @@ class SubmitterMailer < ApplicationMailer
       end
 
     mail(from: from_address_for_submitter(submitter),
-         to: user.friendly_name,
+         to: user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name,
          bcc:,
          subject:)
   end
@@ -125,6 +127,11 @@ class SubmitterMailer < ApplicationMailer
   end
 
   def from_address_for_submitter(submitter)
-    submitter.submission.created_by_user&.friendly_name || submitter.submission.template.author.friendly_name
+    if submitter.submission.created_by_user&.role == 'integration' &&
+       (from_email = AccountConfig.find_by(account: submitter.account, key: 'integration_from_email')&.value.presence)
+      from_email
+    else
+      (submitter.submission.created_by_user || submitter.submission.template.author).friendly_name
+    end
   end
 end
diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb
index a934aeb7..f76b3ad0 100644
--- a/lib/submissions/generate_audit_trail.rb
+++ b/lib/submissions/generate_audit_trail.rb
@@ -70,9 +70,11 @@ module Submissions
 
       composer.column(columns: 1) do |column|
         column.text("Envelope ID: #{submission.id}", font_size: 12, padding: [20, 0, 10, 0], position: :float)
-        column.formatted_text([
-                                { link: verify_url, text: 'Verify', style: :link }
-                              ], font_size: 9, padding: [22, 0, 10, 0], position: :float, align: :right)
+
+        unless submission.source_embed?
+          column.formatted_text([{ link: verify_url, text: 'Verify', style: :link }],
+                                font_size: 9, padding: [22, 0, 10, 0], position: :float, align: :right)
+        end
       end
 
       composer.draw_box(divider)