From c5e9d72889005baf282c27e77f03e301385e8527 Mon Sep 17 00:00:00 2001
From: Fiona Voss <me@fionavoss.com>
Date: Sat, 26 Apr 2025 17:48:17 -0700
Subject: [PATCH 1/5] Make text visible in distribution email

---
 .../partner_mailer.html.erb                   | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/app/views/distribution_mailer/partner_mailer.html.erb b/app/views/distribution_mailer/partner_mailer.html.erb
index e23fe64829..a563e77f64 100644
--- a/app/views/distribution_mailer/partner_mailer.html.erb
+++ b/app/views/distribution_mailer/partner_mailer.html.erb
@@ -217,19 +217,6 @@
       margin-bottom: 0;
     }
 
-    .preheader {
-      color: transparent;
-      display: none;
-      height: 0;
-      max-height: 0;
-      max-width: 0;
-      opacity: 0;
-      overflow: hidden;
-      mso-hide: all;
-      visibility: hidden;
-      width: 0;
-    }
-
     .powered-by a {
       text-decoration: none;
     }
@@ -328,7 +315,6 @@
         <div class="content">
 
           <!-- START CENTERED WHITE CONTAINER -->
-        <span class="preheader">You have a new distribution from <%= @partner.organization.name %>. Please refer to the attachment for details.</span>
           <table role="presentation" class="main">
 
             <!-- START MAIN CONTENT AREA -->
@@ -336,10 +322,15 @@
               <td class="wrapper">
                 <table role="presentation" border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td>
+                    <td class="content-block">
+                      You have a new distribution from <%= @partner.organization.name %>. Please refer to the attachment for details.
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="content-block">
                     From: <a href="mailto:<%= @from_email %>"><%= @from_email %></a>
                     </td>
-                </tr>
+                  </tr>
                   <tr>
                     <td>
                     <%= @default_email_text_interpolated.html_safe %>

From cfa4e5677a4cae735870f45cf74688b030c5af61 Mon Sep 17 00:00:00 2001
From: Fiona Voss <me@fionavoss.com>
Date: Wed, 30 Apr 2025 11:17:54 -0700
Subject: [PATCH 2/5] Show default text if custom text not present

---
 .../distribution_mailer/partner_mailer.html.erb    | 14 +++++++-------
 spec/mailers/distribution_mailer_spec.rb           | 11 +++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/views/distribution_mailer/partner_mailer.html.erb b/app/views/distribution_mailer/partner_mailer.html.erb
index a563e77f64..d891a7acb8 100644
--- a/app/views/distribution_mailer/partner_mailer.html.erb
+++ b/app/views/distribution_mailer/partner_mailer.html.erb
@@ -322,18 +322,18 @@
               <td class="wrapper">
                 <table role="presentation" border="0" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td class="content-block">
-                      You have a new distribution from <%= @partner.organization.name %>. Please refer to the attachment for details.
-                    </td>
-                  </tr>
-                  <tr>
-                    <td class="content-block">
+                    <td>
                     From: <a href="mailto:<%= @from_email %>"><%= @from_email %></a>
                     </td>
                   </tr>
                   <tr>
                     <td>
-                    <%= @default_email_text_interpolated.html_safe %>
+                      <% if @default_email_text_interpolated.present? %>
+                        <%= @default_email_text_interpolated.html_safe %>
+                      <% else %>
+                        You have a new distribution from <%= @partner.organization.name %>.
+                        Please refer to the attachment for details.
+                      <% end %>
                     </td>
                   </tr>
                 <% if @distribution_changes.present? %>
diff --git a/spec/mailers/distribution_mailer_spec.rb b/spec/mailers/distribution_mailer_spec.rb
index 2ec55dedf9..2bda2e28ab 100644
--- a/spec/mailers/distribution_mailer_spec.rb
+++ b/spec/mailers/distribution_mailer_spec.rb
@@ -34,6 +34,17 @@
       expect(mail.subject).to eq("test subject from TEST ORG")
     end
 
+    context "when organization does not have custom default_email_text" do
+      before do
+        organization.default_email_text = nil
+        organization.save
+      end
+
+      it "renders non-custom text" do
+        expect(mail.body.encoded).to match("You have a new distribution from #{organization.name}.")
+      end
+    end
+
     context "with deliver_method: :pick_up" do
       let(:mail) do
         distribution = create(:distribution, organization: user.organization, comment: "Distribution comment", partner: partner, delivery_method: :pick_up)

From 1041f1b068bec0d9403873542e3bc69d1fd5b55b Mon Sep 17 00:00:00 2001
From: Fiona Voss <me@fionavoss.com>
Date: Thu, 1 May 2025 13:07:08 -0700
Subject: [PATCH 3/5] Only show default text if no distribution changes

---
 .../partner_mailer.html.erb                   |  2 +-
 spec/mailers/distribution_mailer_spec.rb      | 45 ++++++++++++++-----
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/app/views/distribution_mailer/partner_mailer.html.erb b/app/views/distribution_mailer/partner_mailer.html.erb
index d891a7acb8..8b957690b6 100644
--- a/app/views/distribution_mailer/partner_mailer.html.erb
+++ b/app/views/distribution_mailer/partner_mailer.html.erb
@@ -330,7 +330,7 @@
                     <td>
                       <% if @default_email_text_interpolated.present? %>
                         <%= @default_email_text_interpolated.html_safe %>
-                      <% else %>
+                      <% elsif !@distribution_changes.present? %>
                         You have a new distribution from <%= @partner.organization.name %>.
                         Please refer to the attachment for details.
                       <% end %>
diff --git a/spec/mailers/distribution_mailer_spec.rb b/spec/mailers/distribution_mailer_spec.rb
index 2bda2e28ab..9b76fdced3 100644
--- a/spec/mailers/distribution_mailer_spec.rb
+++ b/spec/mailers/distribution_mailer_spec.rb
@@ -34,17 +34,6 @@
       expect(mail.subject).to eq("test subject from TEST ORG")
     end
 
-    context "when organization does not have custom default_email_text" do
-      before do
-        organization.default_email_text = nil
-        organization.save
-      end
-
-      it "renders non-custom text" do
-        expect(mail.body.encoded).to match("You have a new distribution from #{organization.name}.")
-      end
-    end
-
     context "with deliver_method: :pick_up" do
       let(:mail) do
         distribution = create(:distribution, organization: user.organization, comment: "Distribution comment", partner: partner, delivery_method: :pick_up)
@@ -111,6 +100,40 @@
         expect(mail.body.encoded).to match(distribution_changes[:updates][0][:name])
       end
     end
+
+    context "when organization does not have custom default_email_text" do
+      before do
+        organization.default_email_text = nil
+        organization.save
+      end
+
+      context "without distribution changes" do
+        it "renders non-custom text" do
+          expect(mail.body.encoded).to match("You have a new distribution from #{organization.name}.")
+        end
+      end
+
+      context "with distribution changes" do
+        let(:distribution_changes) do
+          {
+            removed: [
+              { name: "Adult Diapers" }
+            ],
+            updates: [
+              {
+                name: "Kid Diapers",
+                new_quantity: 4,
+                old_quantity: 100
+              }
+            ]
+          }
+        end
+
+        it "does not render non-custom text" do
+          expect(mail.body.encoded).to_not match("You have a new distribution from #{organization.name}.")
+        end
+      end
+    end
   end
 
   describe "#reminder_email" do

From bcb5e0a07c49d56c881475a687ab5aa73f0d4db4 Mon Sep 17 00:00:00 2001
From: Fiona Voss <me@fionavoss.com>
Date: Sun, 11 May 2025 10:14:24 -0700
Subject: [PATCH 4/5] Handle default_email_text with whitespace/empty divs/HTML
 comments

---
 app/views/distribution_mailer/partner_mailer.html.erb | 2 +-
 spec/mailers/distribution_mailer_spec.rb              | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/distribution_mailer/partner_mailer.html.erb b/app/views/distribution_mailer/partner_mailer.html.erb
index 8b957690b6..ea27a790b7 100644
--- a/app/views/distribution_mailer/partner_mailer.html.erb
+++ b/app/views/distribution_mailer/partner_mailer.html.erb
@@ -328,7 +328,7 @@
                   </tr>
                   <tr>
                     <td>
-                      <% if @default_email_text_interpolated.present? %>
+                      <% if @default_email_text.present? %>
                         <%= @default_email_text_interpolated.html_safe %>
                       <% elsif !@distribution_changes.present? %>
                         You have a new distribution from <%= @partner.organization.name %>.
diff --git a/spec/mailers/distribution_mailer_spec.rb b/spec/mailers/distribution_mailer_spec.rb
index 9b76fdced3..26631de40f 100644
--- a/spec/mailers/distribution_mailer_spec.rb
+++ b/spec/mailers/distribution_mailer_spec.rb
@@ -103,7 +103,8 @@
 
     context "when organization does not have custom default_email_text" do
       before do
-        organization.default_email_text = nil
+        # When default_email_text is cleared through UI, it still contains whitespace/empty divs/HTML comments
+        organization.default_email_text = "<!-- comment --><div class='empty'>\n  </div>"
         organization.save
       end
 

From e23d92b0210ab5de273bf50de3ba4392f95e4af0 Mon Sep 17 00:00:00 2001
From: Fiona Voss <me@fionavoss.com>
Date: Sun, 1 Jun 2025 15:14:34 -0700
Subject: [PATCH 5/5] Update
 app/views/distribution_mailer/partner_mailer.html.erb

Co-authored-by: Daniel Orner <daniel.orner@flipp.com>
---
 app/views/distribution_mailer/partner_mailer.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/distribution_mailer/partner_mailer.html.erb b/app/views/distribution_mailer/partner_mailer.html.erb
index ea27a790b7..b2d3f77862 100644
--- a/app/views/distribution_mailer/partner_mailer.html.erb
+++ b/app/views/distribution_mailer/partner_mailer.html.erb
@@ -330,7 +330,7 @@
                     <td>
                       <% if @default_email_text.present? %>
                         <%= @default_email_text_interpolated.html_safe %>
-                      <% elsif !@distribution_changes.present? %>
+                      <% elsif @distribution_changes.blank? %>
                         You have a new distribution from <%= @partner.organization.name %>.
                         Please refer to the attachment for details.
                       <% end %>