diff --git a/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap b/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap index 4315ec4374..a40dc54480 100644 --- a/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap +++ b/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap @@ -8,114 +8,102 @@ exports[`Incoming Recommendation Emails Sends a different email if we receive a
From:
-{{donation.name}} {{#if memberData}}• View{{/if}}
+{{donation.name}} {{#if memberData}}• View{{/if}}
Amount received:
-{{donation.amount}}
+{{donation.amount}}
{{#if donation.donationMessage}}“{{donation.donationMessage}}”
{{/if}} diff --git a/ghost/staff-service/lib/email-templates/new-free-signup.hbs b/ghost/staff-service/lib/email-templates/new-free-signup.hbs index 3263e6a750..db82aa1f51 100644 --- a/ghost/staff-service/lib/email-templates/new-free-signup.hbs +++ b/ghost/staff-service/lib/email-templates/new-free-signup.hbs @@ -42,13 +42,13 @@Name:
-{{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}
+{{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}
{{#if referrerSource}}Source:
-{{referrerSource}}
+{{referrerSource}}
{{#if attributionTitle}}Page:
- + {{/if}} {{/if}}Name:
-{{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}
+{{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}
Tier:
-{{tierData.name}}{{#if tierData.details}} • {{tierData.details}}{{/if}}
+{{tierData.name}}{{#if tierData.details}} • {{tierData.details}}{{/if}}
{{#if subscriptionData.cancelNow}}Expired on:
{{else}}Expires on:
{{/if}} -{{subscriptionData.expiryAt}}
+{{subscriptionData.expiryAt}}
{{#if subscriptionData.cancellationReason}}"{{subscriptionData.cancellationReason}}"
{{/if}} diff --git a/ghost/staff-service/lib/email-templates/new-paid-started.hbs b/ghost/staff-service/lib/email-templates/new-paid-started.hbs index 8d6d96db63..38cc764c65 100644 --- a/ghost/staff-service/lib/email-templates/new-paid-started.hbs +++ b/ghost/staff-service/lib/email-templates/new-paid-started.hbs @@ -42,19 +42,19 @@Name:
-{{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}
+{{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}
Tier:
-{{tierData.name}}{{#if tierData.details}} • {{tierData.details}}{{/if}}
+{{tierData.name}}{{#if tierData.details}} • {{tierData.details}}{{/if}}
{{#if offerData}}Offer:
-{{offerData.name}} • {{offerData.details}}
+{{offerData.name}} • {{offerData.details}}
{{/if}} {{#if referrerSource}}Source:
-{{referrerSource}}
+{{referrerSource}}
{{#if attributionTitle}}Page:
- + {{/if}} {{/if}}