- New free subscriber to {{siteTitle}}
+ You have a new free member
@@ -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:
- {{attributionTitle}}
+ {{attributionTitle}}
{{/if}}
{{/if}}
|
@@ -95,7 +95,7 @@
|
- Don’t want to receive these emails? Manage your preferences here.
+ Don’t want to receive these emails? Manage your preferences here.
|
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 d3b7674207..4c09b96c8c 100644
--- a/ghost/staff-service/lib/email-templates/new-paid-started.hbs
+++ b/ghost/staff-service/lib/email-templates/new-paid-started.hbs
@@ -26,77 +26,52 @@
+ {{#if siteIconUrl}}
+
+  |
+
+ {{/if}}
|
- Congratulations!
- You have a new paid member.
-
-
-
-
-
-
-
- |
-
- {{memberData.initials}}
-
- |
-
- {{memberData.name}}
- {{#if memberData.showEmail}}
- {{memberData.email}}
- {{/if}}
- Subscription started on {{subscriptionData.startedOn}}
- |
-
-
- |
-
-
-
-
-
-
- |
-
- Tier
-
- {{tierData.name}}
- {{#if tierData.details}} - {{tierData.details}}{{/if}}
-
-
- {{#if offerData}}
- Offer
-
- {{offerData.name}} - {{offerData.details}}
- {{/if}}
-
- {{#if referrerSource}}
- Signup info
-
- Source
- - {{referrerSource}}
-
- {{#if attributionTitle}}
- Page
- - {{attributionTitle}}
-
- {{/if}}
- {{/if}}
-
- |
-
-
-
-
+ You have a new paid subscriber
+
-
-
+
+
+
+ |
+ Name:
+ {{memberData.name}}{{#if memberData.showEmail}} ({{memberData.email}}){{/if}}
+ Tier:
+ {{tierData.name}}{{#if tierData.details}} • {{tierData.details}}{{/if}}
+ {{#if offerData}}
+ Offer:
+ {{offerData.name}} • {{offerData.details}}
+ {{/if}}
+ {{#if referrerSource}}
+ Source:
+ {{referrerSource}}
+ {{#if attributionTitle}}
+ Page:
+ {{attributionTitle}}
+ {{/if}}
+ {{/if}}
+ |
+
+
+
@@ -104,21 +79,29 @@
|
-
- You can also copy & paste this URL into your browser:
- {{memberData.adminUrl}}
+
+
+
+
+ |
+ Or copy and paste this URL into your browser:
+ {{memberData.adminUrl}}
+ |
+
+
+
|
- |
- This message was sent from {{siteDomain}} to {{toEmail}}
+ |
+ This message was sent from {{siteDomain}} to {{toEmail}}
|
- |
- Don’t want to receive these emails? Manage your preferences here.
+ |
+ Don’t want to receive these emails? Manage your preferences here.
|
diff --git a/ghost/staff-service/test/staff-service.test.js b/ghost/staff-service/test/staff-service.test.js
index 1de3d71693..9540897a69 100644
--- a/ghost/staff-service/test/staff-service.test.js
+++ b/ghost/staff-service/test/staff-service.test.js
@@ -78,10 +78,6 @@ function testCommonPaidSubMailData({member, mailStub, getEmailAlertUsersStub}) {
mailStub.calledWith(
sinon.match.has('html', sinon.match('$50.00/month'))
).should.be.true();
-
- mailStub.calledWith(
- sinon.match.has('html', sinon.match('Subscription started on 1 Aug 2022'))
- ).should.be.true();
}
function testCommonPaidSubCancelMailData({mailStub, getEmailAlertUsersStub}) {
@@ -518,9 +514,7 @@ describe('StaffService', function () {
member = {
name: 'Ghost',
email: 'member@example.com',
- id: 'abc',
- geolocation: '{"country": "France"}',
- created_at: '2022-08-01T07:30:39.882Z'
+ id: 'abc'
};
offer = {
name: 'Half price',
@@ -586,9 +580,7 @@ describe('StaffService', function () {
it('sends paid subscription start alert without member name', async function () {
let memberData = {
email: 'member@example.com',
- id: 'abc',
- geolocation: '{"country": "France"}',
- created_at: '2022-08-01T07:30:39.882Z'
+ id: 'abc'
};
await service.emails.notifyPaidSubscriptionStarted({member: memberData, offer: null, tier, subscription}, options);
| | |